diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-29 17:49:02 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 15:59:54 +0200 |
commit | 3e396d5ef17c9a62a4da5ab4bba3713393ca61c5 (patch) | |
tree | 39738108a1c9e2e283add070c372f055c2462d88 | |
parent | 0b2f4d57e47eae6ca296d4a9c132f9ebdd6423f4 (diff) |
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 <simon.hausmann@qt.io>
-rw-r--r-- | .gitmodules | 82 | ||||
m--------- | qt3d | 0 | ||||
m--------- | qtactiveqt | 0 | ||||
m--------- | qtbase | 0 | ||||
m--------- | qtcharts | 0 | ||||
m--------- | qtconnectivity | 0 | ||||
m--------- | qtdatavis3d | 0 | ||||
m--------- | qtdeclarative | 0 | ||||
m--------- | qtgraphicaleffects | 0 | ||||
m--------- | qtlocation | 0 | ||||
m--------- | qtmultimedia | 0 | ||||
m--------- | qtpurchasing | 0 | ||||
m--------- | qtquickcontrols2 | 0 | ||||
m--------- | qtremoteobjects | 0 | ||||
m--------- | qtscript | 0 | ||||
m--------- | qtscxml | 0 | ||||
m--------- | qtsensors | 0 | ||||
m--------- | qtserialport | 0 | ||||
m--------- | qtsvg | 0 | ||||
m--------- | qttools | 0 | ||||
m--------- | qtvirtualkeyboard | 0 | ||||
m--------- | qtwayland | 0 | ||||
m--------- | qtwebchannel | 0 | ||||
m--------- | qtwebview | 0 | ||||
m--------- | qtwinextras | 0 | ||||
m--------- | qtxmlpatterns | 0 |
26 files changed, 41 insertions, 41 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 -Subproject 58db7d01e0d424fdf46baa70e2e41b8009429c7 +Subproject 1b4487817e68a5e87eff54793b02c85792accc1 diff --git a/qtactiveqt b/qtactiveqt -Subproject be1aab204340c1af23df1c393970f5d245ec0a3 +Subproject 62ed66bce6e6602d82f9474a8589a7dabd7bc9c diff --git a/qtbase b/qtbase -Subproject bcd4b14026094d0077ad1069054676cc6da9625 +Subproject f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e diff --git a/qtcharts b/qtcharts -Subproject a325914557d7a56d0ce3ad789a703fdb1c96d59 +Subproject 1c361fe93ea27706928047b8e4e4b2d9aea174f diff --git a/qtconnectivity b/qtconnectivity -Subproject 00cc61aa4e9d624dc4894afe819f7413a9204a6 +Subproject eda28d82e239c57533e73be622b26a3985fb86c diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 7d898954aa9e3c75d44abae81dff563a8b4b003 +Subproject c4c7a35ea5d8faee7e315d26a2251ac02ffef10 diff --git a/qtdeclarative b/qtdeclarative -Subproject ad4960b40461c8b83599fe71540086182adecb1 +Subproject cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 042890a01c19595a91268c536b81a94134b9180 +Subproject 3d74af5ee50fb949520f64923658a9b30b6bb5c diff --git a/qtlocation b/qtlocation -Subproject 0a8f8f40c2fdfccc4bd1bf3c7411085ed634700 +Subproject 31eada8ecaabb1a969f315fe46d35971f61c6e8 diff --git a/qtmultimedia b/qtmultimedia -Subproject e99a2e1701179d0d28ef1d1eac696d480894f4b +Subproject 89af8871c653197d91541858013d08b8e7cbf75 diff --git a/qtpurchasing b/qtpurchasing -Subproject 0b3d10cd5070a54dd71fbd067dcf6691c66c228 +Subproject 0a627f674d607a496703d1f33cb8cfe68a76ff2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 108ba34909a12d5d2d02a8a9cb738aaf65ac886 +Subproject 82b64b8bec92212b90ee0987511179e14e1da07 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 8e79ec32f81aa65ac9ce1ad42ad1ee5452d4234 +Subproject 4f943eda910e3f7864cc0ca44113ae017fa5f92 diff --git a/qtscript b/qtscript -Subproject 5c7733d5c5564a64468c5fdd5e8bd29cc131784 +Subproject 593ee850821dbe9eb7ff139eb2485d814694ca8 diff --git a/qtscxml b/qtscxml -Subproject 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a44 +Subproject b5daa31da99fbe872b4df047f37da17ae2c119c diff --git a/qtsensors b/qtsensors -Subproject a436a733c3a07adb61f1ed9e2793fc47453ad2b +Subproject bcc717b9ff5e9832794171217436029479b50f8 diff --git a/qtserialport b/qtserialport -Subproject 126809f150f03ab07b94bb508c89cea25440ac4 +Subproject fc7d7799b279d2c1fc2019966604f04e3621847 diff --git a/qtsvg b/qtsvg -Subproject f84b76cfe3f662684222f55981e34cee7a62ddf +Subproject 9fd486637caa7f3064561ad02f02241284a26f6 diff --git a/qttools b/qttools -Subproject 6b2f32f3dc9de965801927a4bc5d970028a318a +Subproject f3d047af903801d9e7705816df5299c4e04a76f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject fac2615b2775e09a36901575898e0628606d2d0 +Subproject b550d02035516dfcb5a3739aa16efbca0e14392 diff --git a/qtwayland b/qtwayland -Subproject 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62 +Subproject 3e9fe00c4e4ae4c096a960b4a3b432fca546007 diff --git a/qtwebchannel b/qtwebchannel -Subproject 43ef51f08bdbd92c8e863fca3b3b8d895560376 +Subproject d87b0adb32e7ed1d897670b59d7ebbb7c504c75 diff --git a/qtwebview b/qtwebview -Subproject a4a49a9a8784f019358faf9bc76cd716b76609d +Subproject 8bfb710fcdddc0b2649f63588eea6eb389a5453 diff --git a/qtwinextras b/qtwinextras -Subproject 882777808d729ff1cdc129d555a739b065eedba +Subproject f5bc2b6e6e4985ee113c595abdd1a4bd8b3472f diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject ee64d3cb160347fe19a86b47f3b26b78b20502b +Subproject 5c6aaf182f2fa4860f9bdabcc31970769198a81 |