From 621c18b60b640572ffbad57e7f669e048ac63bb4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 11 Aug 2019 10:15:26 +0200 Subject: 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 Reviewed-by: Alexandru Croitor --- .gitmodules | 2 +- qt3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- 8 files changed, 8 insertions(+), 8 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 index 1b448781..336e0eb1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1b4487817e68a5e87eff54793b02c85792accc10 +Subproject commit 336e0eb1bc21215012f56f725ebbfb5710d22814 diff --git a/qtdeclarative b/qtdeclarative index cb37a1d0..9e32b23a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b +Subproject commit 9e32b23a1514f367921b4a9ee25bc864a008463c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3d74af5e..433dd81e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3d74af5ee50fb949520f64923658a9b30b6bb5c8 +Subproject commit 433dd81e28ea86f2790a6eadccb73609feaa4754 diff --git a/qtimageformats b/qtimageformats index 27620737..657f6d3c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2762073738d0343b2ba6e38624de2040c34bc393 +Subproject commit 657f6d3c125d852c25c1233f473782eb81e03ab9 diff --git a/qtnetworkauth b/qtnetworkauth index c82ade62..4655361d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8c +Subproject commit 4655361d2fe804d725646a2a45e0a1bc7a44c1d1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 82b64b8b..341ace84 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 82b64b8bec92212b90ee0987511179e14e1da071 +Subproject commit 341ace84485ffb3c2f05818e1b95604849217c9a diff --git a/qtsvg b/qtsvg index 9fd48663..24a7b418 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9fd486637caa7f3064561ad02f02241284a26f66 +Subproject commit 24a7b41822333f33c2ec5027795e265a5ad0d350 -- cgit v1.2.3