From 5677a43a25a9dc1a3151e6b28cbf9fe015a1aff4 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 16 May 2019 10:07:51 +0200 Subject: Remove platforms from Qt 6 Get to a smaller set to reduce load on the CI and have faster turnaround times while developing. Remove some older compilers that do not support the minimum C++ feature set we want to require for Qt 6. We'll need to revisit and probably expand this set when we get closer to releasing Qt 6. Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 10 ---------- coin/platform_configs/qtbase.txt | 1 - 2 files changed, 11 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 77f23f05..47b7e842 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,18 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 7a4b85bf..899376ce 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -2,5 +2,4 @@ Template Target OS Target arch Compiler Fe --------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -nomake examples -nomake tests -static -no-icu -release -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -developer-build -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -nomake examples -nomake tests -prefix /home/qt/work/install -static -verbose -xplatform wasm-emscripten -- cgit v1.2.3 From 84e57b1fb03b449cc25bb67a3c32d09462793571 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 5 Jul 2019 11:00:29 +0200 Subject: Try to update sha1s of submodules to get a working qt5 wip/qt6 branch qtbase, qtremoteobjects, qtquickcontrols, qtquickcontrols2 qtlocation and qttools are updated to latest dev HEAD. qtimageformats, qtnetworkauth, qtsvg, qtdeclarative are updated to point to latest wip/qt6 HEAD. Change-Id: I70938d0d258208670c7d3e3f73fe3e3b274c2eb2 Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index a0c4b6f3..bcd4b140 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0c4b6f34546bdd22167a76a0540d37e9a37c0cf +Subproject commit bcd4b14026094d0077ad1069054676cc6da96251 diff --git a/qtdeclarative b/qtdeclarative index 3fff0304..0f2178a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3fff03048a48aa7ead6e888165b2ae5a118d675c +Subproject commit 0f2178a7e3cba4992f8b6e32927534daa5c6ee7e diff --git a/qtimageformats b/qtimageformats index 9a4a2dd5..27620737 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9a4a2dd5189e1659bce46eacef513b0c5680bb1e +Subproject commit 2762073738d0343b2ba6e38624de2040c34bc393 diff --git a/qtlocation b/qtlocation index 971423c5..a0cc254c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 971423c512623b84618cfc73b992da1f1dc014f8 +Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 diff --git a/qtnetworkauth b/qtnetworkauth index 8bc6feb3..c82ade62 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8bc6feb36a471006cfa4b62189edc3d7fd67bf78 +Subproject commit c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8c diff --git a/qtquickcontrols b/qtquickcontrols index d2a661f1..81c5d9cd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d2a661f16e9982c45260efb9875b83c581b82287 +Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da150dac..9cd1ee92 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da150dacec8a2a68d290141b1e0ab268ce648edb +Subproject commit 9cd1ee923eea11d084d41158458bbb73a906c75c diff --git a/qtremoteobjects b/qtremoteobjects index 99df6cb9..25d9b378 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 99df6cb9fc2cd598dd33c89e7781f5963b739508 +Subproject commit 25d9b378a42daa723dd79191f0f2cfd03285651a diff --git a/qtsvg b/qtsvg index 1983ba1d..f84b76cf 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 +Subproject commit f84b76cfe3f662684222f55981e34cee7a62ddff diff --git a/qttools b/qttools index ee122e6a..f7a50cab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ee122e6a0752634ed9dddf0937fa386709059c75 +Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 diff --git a/qtwayland b/qtwayland index 14d37a53..28572232 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 14d37a53a674d7dbef32e718ae391e265fad5fac +Subproject commit 2857223212ef56810b61ea97fb977573700ab1e0 -- cgit v1.2.3 From 0b2f4d57e47eae6ca296d4a9c132f9ebdd6423f4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 8 Jul 2019 17:48:52 +0200 Subject: Update qt5 wip/qt6 qtbase pointing to dev branch, and other repos pointing to wip/qt6. qtwebengine and qtwebview are not built at the moment. The build of the mentioned repos will be restored after bumping qtbase version to 6.0.0, and after the subsequent qt/qt5 wip/qt6 integration is merged. Change-Id: I9b6b8136b2f58b181ae2d2dadb8a96b9c1103225 Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3c46af7..88c9d120 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,7 +230,7 @@ path = qtwebview url = ../qtwebview.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats diff --git a/qt3d b/qt3d index b0db56de..58db7d01 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0db56ded0f38e9f59f379c6ff80b668ed49c743 +Subproject commit 58db7d01e0d424fdf46baa70e2e41b8009429c78 diff --git a/qtactiveqt b/qtactiveqt index 2d740d31..be1aab20 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2d740d313342a014169d5f317da53e499ff4432e +Subproject commit be1aab204340c1af23df1c393970f5d245ec0a33 diff --git a/qtandroidextras b/qtandroidextras index ecdf7177..d5709763 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ecdf7177b90c8c5de060da076b12e4869e57b4d5 +Subproject commit d5709763486bab11b545000df90b2b79fa5acdd9 diff --git a/qtcharts b/qtcharts index 9e28f427..a3259145 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9e28f427009ee3cd25b4d1a8cd446049d51152a4 +Subproject commit a325914557d7a56d0ce3ad789a703fdb1c96d597 diff --git a/qtconnectivity b/qtconnectivity index 16e37407..00cc61aa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16e37407cd6ad369d5250de1b9dac83083a45200 +Subproject commit 00cc61aa4e9d624dc4894afe819f7413a9204a68 diff --git a/qtdatavis3d b/qtdatavis3d index 21583347..7d898954 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 215833472171b17db506d49646c639b4fff926ab +Subproject commit 7d898954aa9e3c75d44abae81dff563a8b4b003d diff --git a/qtdeclarative b/qtdeclarative index 0f2178a7..ad4960b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0f2178a7e3cba4992f8b6e32927534daa5c6ee7e +Subproject commit ad4960b40461c8b83599fe71540086182adecb10 diff --git a/qtdoc b/qtdoc index 9debad60..4813f219 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9debad60b88ffb51f50d111f9b4f871f5418622b +Subproject commit 4813f21919eb8b240f4b8c704b9298ac5e1d0731 diff --git a/qtgamepad b/qtgamepad index 337abe99..c6caf0b0 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 337abe99492d7d6d5229b615fa1559fc2f4ee6eb +Subproject commit c6caf0b09b934c03a11c1b97df8e453875332f7b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fe2eefc0..042890a0 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fe2eefc036f3f42457e7f2e012f21fdec84550eb +Subproject commit 042890a01c19595a91268c536b81a94134b91807 diff --git a/qtlocation b/qtlocation index a0cc254c..0a8f8f40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 +Subproject commit 0a8f8f40c2fdfccc4bd1bf3c7411085ed634700e diff --git a/qtlottie b/qtlottie index 254ea99a..afb6ddb7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 254ea99abd181abe5468b7cc5ece0e2ae51da185 +Subproject commit afb6ddb79c573c205ecffeccf9000132f566700f diff --git a/qtmacextras b/qtmacextras index ca1414e6..850602bb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ca1414e6b7ce219efa86e965a5c031b79e7a604e +Subproject commit 850602bb38337060ed31c1a8bbcff6eb195ffcc0 diff --git a/qtmultimedia b/qtmultimedia index f0f354f2..e99a2e17 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f0f354f2a1eec54733c871bf735f67e0c4ea945c +Subproject commit e99a2e1701179d0d28ef1d1eac696d480894f4bb diff --git a/qtpurchasing b/qtpurchasing index 91fc2ee3..0b3d10cd 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 91fc2ee34cfd674d134e88dc7f3c54453ec685e7 +Subproject commit 0b3d10cd5070a54dd71fbd067dcf6691c66c228a diff --git a/qtquickcontrols b/qtquickcontrols index 81c5d9cd..1987f308 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd +Subproject commit 1987f30831954ce05b6d7908b4866999b2d9b183 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9cd1ee92..108ba349 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9cd1ee923eea11d084d41158458bbb73a906c75c +Subproject commit 108ba34909a12d5d2d02a8a9cb738aaf65ac8868 diff --git a/qtquicktimeline b/qtquicktimeline index 6e6d4927..c9e240bc 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f +Subproject commit c9e240bc24e276bbe79c0cf0c7ee8ea3aab59625 diff --git a/qtremoteobjects b/qtremoteobjects index 25d9b378..8e79ec32 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 25d9b378a42daa723dd79191f0f2cfd03285651a +Subproject commit 8e79ec32f81aa65ac9ce1ad42ad1ee5452d42341 diff --git a/qtscript b/qtscript index 583dcc6d..5c7733d5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 +Subproject commit 5c7733d5c5564a64468c5fdd5e8bd29cc131784c diff --git a/qtscxml b/qtscxml index 01bc8df0..38f88ebf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01bc8df0760e14449ca7d5b6c187bf9870efbd3d +Subproject commit 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a447 diff --git a/qtsensors b/qtsensors index 6a8e8a64..a436a733 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6a8e8a64d3473c5ff890c022b738862a704516dc +Subproject commit a436a733c3a07adb61f1ed9e2793fc47453ad2bb diff --git a/qtserialbus b/qtserialbus index f12d420e..9df66161 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f12d420e8492b85e8aa2a7982e81a88cb1098d6c +Subproject commit 9df66161c57e7bee405fff37dfa034f77c254855 diff --git a/qtserialport b/qtserialport index 450156f3..126809f1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 450156f37356f67f217de760a5df3149684dd99f +Subproject commit 126809f150f03ab07b94bb508c89cea25440ac41 diff --git a/qtspeech b/qtspeech index 5cf744a0..b80e22cd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5cf744a096bb079bd33e417e9fb62a6d6726a3a3 +Subproject commit b80e22cd1e79a3a09e69261bcb38497bfe9634f7 diff --git a/qttools b/qttools index f7a50cab..6b2f32f3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 +Subproject commit 6b2f32f3dc9de965801927a4bc5d970028a318a6 diff --git a/qttranslations b/qttranslations index 66952c79..e94d85e9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 66952c79bc648e1074936dddb7fa2cffc17b1777 +Subproject commit e94d85e931ee3704192aa4d42c2bc44f0df47b8e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe52858d..fac2615b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe52858df5c641eb9fb0df02e33d5b328d6b00e7 +Subproject commit fac2615b2775e09a36901575898e0628606d2d06 diff --git a/qtwayland b/qtwayland index 28572232..671f73bb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2857223212ef56810b61ea97fb977573700ab1e0 +Subproject commit 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62e diff --git a/qtwebchannel b/qtwebchannel index 6031bd7b..43ef51f0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6031bd7bfdf97c492f9f11b4bd0a5375613b55de +Subproject commit 43ef51f08bdbd92c8e863fca3b3b8d8955603764 diff --git a/qtwebengine b/qtwebengine index 0c2beb49..83fa1d5f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 +Subproject commit 83fa1d5f9b890ba251f7dc8f82acd950e9527343 diff --git a/qtwebglplugin b/qtwebglplugin index 2f419ac8..384f5518 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3 +Subproject commit 384f551844ddb9ea0042a0894a9dad7a90dd9935 diff --git a/qtwebsockets b/qtwebsockets index 2e54dbe8..a5b0495a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 +Subproject commit a5b0495ac273bcc841298b52dae3ca9bb608edf7 diff --git a/qtwebview b/qtwebview index fac66332..a4a49a9a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fac66332c76e2fc9c29aa2508a41cd9392825d25 +Subproject commit a4a49a9a8784f019358faf9bc76cd716b76609db diff --git a/qtwinextras b/qtwinextras index 878d6226..88277780 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 878d6226f2472b3dff192207aa0c2a03eb4d3465 +Subproject commit 882777808d729ff1cdc129d555a739b065eedbae diff --git a/qtx11extras b/qtx11extras index 821e5be0..0399b825 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea +Subproject commit 0399b825a1ff7470ed6fd272de8ba74e2be971c3 diff --git a/qtxmlpatterns b/qtxmlpatterns index e5582749..ee64d3cb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e5582749e285ff22b634b1e7d0a37f076b2a7be3 +Subproject commit ee64d3cb160347fe19a86b47f3b26b78b20502bf -- cgit v1.2.3 From 3e396d5ef17c9a62a4da5ab4bba3713393ca61c5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 29 Jul 2019 17:49:02 +0200 Subject: Update qt5 wip/qt6 Point qtbase to wip/qt6. And use new sha1s for other repositories when needed. And update .gitmodules branch to point to wip/qt6. Change-Id: Ic12a106d1b491f77277419a27b61396ba07f1737 Reviewed-by: Simon Hausmann --- .gitmodules | 82 +++++++++++++++++++++++++++--------------------------- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.gitmodules b/.gitmodules index 88c9d120..cfd15d9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = wip/qt6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = wip/qt6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = wip/qt6 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = wip/qt6 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = wip/qt6 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = wip/qt6 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = wip/qt6 status = ignore priority = 10 [submodule "qtcanvas3d"] @@ -229,92 +229,92 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = wip/qt6 status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = wip/qt6 status = preview [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = wip/qt6 status = preview diff --git a/qt3d b/qt3d index 58db7d01..1b448781 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 58db7d01e0d424fdf46baa70e2e41b8009429c78 +Subproject commit 1b4487817e68a5e87eff54793b02c85792accc10 diff --git a/qtactiveqt b/qtactiveqt index be1aab20..62ed66bc 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit be1aab204340c1af23df1c393970f5d245ec0a33 +Subproject commit 62ed66bce6e6602d82f9474a8589a7dabd7bc9ca diff --git a/qtbase b/qtbase index bcd4b140..f44850b5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bcd4b14026094d0077ad1069054676cc6da96251 +Subproject commit f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 diff --git a/qtcharts b/qtcharts index a3259145..1c361fe9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a325914557d7a56d0ce3ad789a703fdb1c96d597 +Subproject commit 1c361fe93ea27706928047b8e4e4b2d9aea174fb diff --git a/qtconnectivity b/qtconnectivity index 00cc61aa..eda28d82 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 00cc61aa4e9d624dc4894afe819f7413a9204a68 +Subproject commit eda28d82e239c57533e73be622b26a3985fb86ce diff --git a/qtdatavis3d b/qtdatavis3d index 7d898954..c4c7a35e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7d898954aa9e3c75d44abae81dff563a8b4b003d +Subproject commit c4c7a35ea5d8faee7e315d26a2251ac02ffef103 diff --git a/qtdeclarative b/qtdeclarative index ad4960b4..cb37a1d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ad4960b40461c8b83599fe71540086182adecb10 +Subproject commit cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 042890a0..3d74af5e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 042890a01c19595a91268c536b81a94134b91807 +Subproject commit 3d74af5ee50fb949520f64923658a9b30b6bb5c8 diff --git a/qtlocation b/qtlocation index 0a8f8f40..31eada8e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a8f8f40c2fdfccc4bd1bf3c7411085ed634700e +Subproject commit 31eada8ecaabb1a969f315fe46d35971f61c6e83 diff --git a/qtmultimedia b/qtmultimedia index e99a2e17..89af8871 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e99a2e1701179d0d28ef1d1eac696d480894f4bb +Subproject commit 89af8871c653197d91541858013d08b8e7cbf751 diff --git a/qtpurchasing b/qtpurchasing index 0b3d10cd..0a627f67 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0b3d10cd5070a54dd71fbd067dcf6691c66c228a +Subproject commit 0a627f674d607a496703d1f33cb8cfe68a76ff2b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 108ba349..82b64b8b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 108ba34909a12d5d2d02a8a9cb738aaf65ac8868 +Subproject commit 82b64b8bec92212b90ee0987511179e14e1da071 diff --git a/qtremoteobjects b/qtremoteobjects index 8e79ec32..4f943eda 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8e79ec32f81aa65ac9ce1ad42ad1ee5452d42341 +Subproject commit 4f943eda910e3f7864cc0ca44113ae017fa5f92b diff --git a/qtscript b/qtscript index 5c7733d5..593ee850 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5c7733d5c5564a64468c5fdd5e8bd29cc131784c +Subproject commit 593ee850821dbe9eb7ff139eb2485d814694ca84 diff --git a/qtscxml b/qtscxml index 38f88ebf..b5daa31d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a447 +Subproject commit b5daa31da99fbe872b4df047f37da17ae2c119c9 diff --git a/qtsensors b/qtsensors index a436a733..bcc717b9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a436a733c3a07adb61f1ed9e2793fc47453ad2bb +Subproject commit bcc717b9ff5e9832794171217436029479b50f81 diff --git a/qtserialport b/qtserialport index 126809f1..fc7d7799 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 126809f150f03ab07b94bb508c89cea25440ac41 +Subproject commit fc7d7799b279d2c1fc2019966604f04e36218470 diff --git a/qtsvg b/qtsvg index f84b76cf..9fd48663 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f84b76cfe3f662684222f55981e34cee7a62ddff +Subproject commit 9fd486637caa7f3064561ad02f02241284a26f66 diff --git a/qttools b/qttools index 6b2f32f3..f3d047af 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6b2f32f3dc9de965801927a4bc5d970028a318a6 +Subproject commit f3d047af903801d9e7705816df5299c4e04a76f4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fac2615b..b550d020 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fac2615b2775e09a36901575898e0628606d2d06 +Subproject commit b550d02035516dfcb5a3739aa16efbca0e143922 diff --git a/qtwayland b/qtwayland index 671f73bb..3e9fe00c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62e +Subproject commit 3e9fe00c4e4ae4c096a960b4a3b432fca546007a diff --git a/qtwebchannel b/qtwebchannel index 43ef51f0..d87b0adb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 43ef51f08bdbd92c8e863fca3b3b8d8955603764 +Subproject commit d87b0adb32e7ed1d897670b59d7ebbb7c504c75c diff --git a/qtwebview b/qtwebview index a4a49a9a..8bfb710f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a4a49a9a8784f019358faf9bc76cd716b76609db +Subproject commit 8bfb710fcdddc0b2649f63588eea6eb389a54532 diff --git a/qtwinextras b/qtwinextras index 88277780..f5bc2b6e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 882777808d729ff1cdc129d555a739b065eedbae +Subproject commit f5bc2b6e6e4985ee113c595abdd1a4bd8b3472fa diff --git a/qtxmlpatterns b/qtxmlpatterns index ee64d3cb..5c6aaf18 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ee64d3cb160347fe19a86b47f3b26b78b20502bf +Subproject commit 5c6aaf182f2fa4860f9bdabcc31970769198a814 -- cgit v1.2.3 From f46f85b0c7a3f6a860569d5c2b36031c1cfe494f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 9 Aug 2019 16:22:35 +0200 Subject: Update qt5 wip/qt6 Point qtbase to latest wip/qt6. Temporarily disable building qt3d because it fails with the new qtbase version, but updating it with old SHA1 of qtbase is also not possible. Change-Id: I232920be48f01608f196c24370c684eccbd3994f Reviewed-by: Simon Hausmann --- .gitmodules | 2 +- qtbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfd15d9a..9220ee7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = wip/qt6 - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qtbase b/qtbase index f44850b5..6132260d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 +Subproject commit 6132260da394a9627947f0fe6a279c20863b6ad2 -- cgit v1.2.3 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 From 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 11 Aug 2019 14:33:17 +0200 Subject: Update qt5 wip/qt6 Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to be built. Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873 Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qtwebengine | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfd15d9a..9396d189 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = wip/qt6 - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,7 +230,7 @@ path = qtwebview url = ../qtwebview.git branch = wip/qt6 - status = ignore + status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats diff --git a/qtwebengine b/qtwebengine index 83fa1d5f..d91b839d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 83fa1d5f9b890ba251f7dc8f82acd950e9527343 +Subproject commit d91b839d67bcfa1cfeb3d095b6885c97c53b9812 -- cgit v1.2.3 From b2febbfbc7ec46f53b58bb6118571020d444315c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Sep 2019 13:35:29 +0200 Subject: Update submodules on 'wip/qt6' in qt5 Only qtmultimedia and qtwebengine in this round. Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564 Reviewed-by: Simon Hausmann --- qtmultimedia | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 89af8871..64ddd6a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 89af8871c653197d91541858013d08b8e7cbf751 +Subproject commit 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f2 diff --git a/qtwebengine b/qtwebengine index d91b839d..2f71cdff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d91b839d67bcfa1cfeb3d095b6885c97c53b9812 +Subproject commit 2f71cdff2cda7903fd0b5ff0033d790877e40181 -- cgit v1.2.3