qt/qtdeclarative.git/tools, branch wip/cmake Qt Declarative (Quick 2) CMake: Regenerate and adapt to merge from dev 2020-03-12T14:05:23+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-03-09T12:53:53+00:00 14492ecee2e34843efd3ef070503a43a48552055 Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> 
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Merge remote-tracking branch 'origin/dev' into wip/cmake 2020-03-12T14:03:03+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-03-10T14:09:37+00:00 26c5243491f495194f04b449128dae36118e28da Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641 
 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Remove leftover qgl.h include 2020-03-10T10:54:36+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-03-09T18:49:38+00:00 d3ec9c86f74efe3a923f42c5a4caf13fb208a645 Change-Id: I1589427a4495ce08ded0944a0f98e1dcacdbb243 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Change-Id: I1589427a4495ce08ded0944a0f98e1dcacdbb243
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2020-03-09T08:58:49+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-09T00:00:06+00:00 d51d5ff3c187821929cf7b765e037423bcc90466 Conflicts: src/qml/compiler/qqmlirbuilder_p.h src/qml/qml/qqmlpropertycachecreator_p.h src/qmltyperegistrar/qmltypesclassdescription.cpp src/qmltyperegistrar/qmltypesclassdescription.h src/qmltyperegistrar/qmltypescreator.cpp src/quick/items/qquicktext_p.h src/quick/util/qquickvaluetypes_p.h Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5 
 Conflicts:
	src/qml/compiler/qqmlirbuilder_p.h
	src/qml/qml/qqmlpropertycachecreator_p.h
	src/qmltyperegistrar/qmltypesclassdescription.cpp
	src/qmltyperegistrar/qmltypesclassdescription.h
	src/qmltyperegistrar/qmltypescreator.cpp
	src/quick/items/qquicktext_p.h
	src/quick/util/qquickvaluetypes_p.h

Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5
Fix build without commandlineparser and temporaryfile 2020-03-04T01:48:18+00:00 Tasuku Suzuki tasuku.suzuki@kdab.com 2020-02-27T18:26:25+00:00 d147b99f753aab42f29cd069b5f028e3f354751e qmltyperegistrar uses QSaveFile which needs features.temporaryfile Change-Id: Ib64eb2d357ee5e75f12f81f15bbe4969d4d96872 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
qmltyperegistrar uses QSaveFile which needs features.temporaryfile

Change-Id: Ib64eb2d357ee5e75f12f81f15bbe4969d4d96872
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Use Qt::SplitBehavior in preference to QString::SplitBehavior 2020-03-02T14:58:47+00:00 Edward Welbourne edward.welbourne@qt.io 2020-02-25T15:10:40+00:00 744246b1129f6042c0264eb578a6e5c86e09f80a The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step cloaser to that goal. Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step cloaser to that goal.

Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Restore offset/length in QQmlJS::DiagnosticMessage 2020-03-02T09:35:50+00:00 Simon Hausmann simon.hausmann@qt.io 2020-02-27T09:49:14+00:00 8ab237edf170f5b0482dccf5169868e5c7c47771 This is needed in a few places outside of declarative, so this change restores the loc member in DiagnosticMessage and moves QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory. QQmlError is unaffected and retains only line/column. Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
This is needed in a few places outside of declarative, so this change
restores the loc member in DiagnosticMessage and moves
QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory.
QQmlError is unaffected and retains only line/column.

Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb

Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2020-02-21T08:00:37+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-02-21T00:00:10+00:00 f6808f89a8c17e046f53b0bb5ff36cd9e24e9772 Conflicts: tests/auto/quick/qquickmousearea/BLACKLIST Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c 
 Conflicts:
	tests/auto/quick/qquickmousearea/BLACKLIST

Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c
Tools: Convert to static type registrations 2020-02-20T14:08:29+00:00 Ulf Hermann ulf.hermann@qt.io 2020-02-20T12:18:00+00:00 aa20222e840fe328b2a5db8d71ec909c1606f838 qml and qmltime were still using qmlRegisterType() for some internals. Let's get rid of those. Change-Id: I68c0e7213f3b5b28670364c4db1cdec41d299b7d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
qml and qmltime were still using qmlRegisterType() for some internals.
Let's get rid of those.

Change-Id: I68c0e7213f3b5b28670364c4db1cdec41d299b7d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Add major version to all Q_REVISIONs 2020-02-19T14:48:27+00:00 Ulf Hermann ulf.hermann@qt.io 2020-01-16T12:42:11+00:00 ddde036f6a5781dc0481fae293bd387b3344171a Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>