diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:15:26 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 13:42:14 +0200 |
| commit | 621c18b60b640572ffbad57e7f669e048ac63bb4 (patch) | |
| tree | 153b57b8c1f0d28a8536d7a5918c8c2e9a43c16d | |
| parent | f46f85b0c7a3f6a860569d5c2b36031c1cfe494f (diff) | |
Update qt5 wip/qt6
Point qt3d, qtdeclarative, qtgraphicaleffects, qtimageformats,
qtnetworkauth, qtquickcontrols2, qtsvg to latest wip/qt6.
Also re-enable the qt3d build.
Change-Id: If9d122e064021b500a423376b991edbb5c1903fc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtnetworkauth | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtsvg | 0 |
8 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 9220ee7a..cfd15d9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = wip/qt6 - status = ignore + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qt3d b/qt3d -Subproject 1b4487817e68a5e87eff54793b02c85792accc1 +Subproject 336e0eb1bc21215012f56f725ebbfb5710d2281 diff --git a/qtdeclarative b/qtdeclarative -Subproject cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01 +Subproject 9e32b23a1514f367921b4a9ee25bc864a008463 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 3d74af5ee50fb949520f64923658a9b30b6bb5c +Subproject 433dd81e28ea86f2790a6eadccb73609feaa475 diff --git a/qtimageformats b/qtimageformats -Subproject 2762073738d0343b2ba6e38624de2040c34bc39 +Subproject 657f6d3c125d852c25c1233f473782eb81e03ab diff --git a/qtnetworkauth b/qtnetworkauth -Subproject c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8 +Subproject 4655361d2fe804d725646a2a45e0a1bc7a44c1d diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 82b64b8bec92212b90ee0987511179e14e1da07 +Subproject 341ace84485ffb3c2f05818e1b95604849217c9 diff --git a/qtsvg b/qtsvg -Subproject 9fd486637caa7f3064561ad02f02241284a26f6 +Subproject 24a7b41822333f33c2ec5027795e265a5ad0d35 |