From 3e396d5ef17c9a62a4da5ab4bba3713393ca61c5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 29 Jul 2019 17:49:02 +0200 Subject: [PATCH] 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