From f008144b88f18d82666898e9e80177a7e5682b44 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Thu, 16 Apr 2020 09:14:58 +0300 Subject: [PATCH 01/11] Adjust submodule branches --- .gitmodules | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9c017725..1b02e9ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.15 + branch = 5.15.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.15 + branch = 5.15.0 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.15 + branch = 5.15.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.15 + branch = 5.15.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.15 + branch = 5.15.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.15 + branch = 5.15.0 status = addon From 767711b44a4c6cf6719db81753b7c800ad3da51d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Apr 2020 20:19:00 +0200 Subject: [PATCH 02/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 0cd80d4f..153ad09e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0cd80d4f4e0390c7ba3aa2b2d36781403c1c2aae +Subproject commit 153ad09effc7388d331c478f0cfe697232a89705 diff --git a/qtactiveqt b/qtactiveqt index cdd58e2c..0aa2b1ac 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cdd58e2c155063f9b52b69a47f45c2430214e3a4 +Subproject commit 0aa2b1ac1d51d7af60a61d5c3a48fc6905cb1b1e diff --git a/qtandroidextras b/qtandroidextras index 645acc14..b67ed634 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 645acc14632f39b3adcc4312d7d1cf8ff915c8c3 +Subproject commit b67ed634117e645b33e200fe4d6b4137f6399df2 diff --git a/qtbase b/qtbase index 8138c812..94b02f6c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8138c812cbd65233a61d6e2e2f783d060c02de60 +Subproject commit 94b02f6cb20fcb597416a46f7e2defced39fb774 diff --git a/qtcharts b/qtcharts index c8e3bf29..785a8d71 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c8e3bf290551328851cf628ce4a488a06b013ac2 +Subproject commit 785a8d7118c4dd6117dd085bbe2da6e4bc717654 diff --git a/qtdatavis3d b/qtdatavis3d index 407bee91..d15ace03 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 407bee91eb83b6ff2df6e5d99366971bf21e2637 +Subproject commit d15ace0300d035283a7137e3a6e9a412ff53d019 diff --git a/qtdeclarative b/qtdeclarative index 94b46de4..796f6e1e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 94b46de4050d023ecbb238c2636d7e252f8f5949 +Subproject commit 796f6e1e8e99ea1046ffe2a744cfd1dca1248258 diff --git a/qtdoc b/qtdoc index 5cec5e99..dfd166b2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5cec5e99f391918c189d501e94523c3f1b5d3c73 +Subproject commit dfd166b29c80e73f5b67c1a1cd05ae197a6d0b97 diff --git a/qtgamepad b/qtgamepad index 19671371..b036b587 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 196713714a63e789b65822e2222208251857359b +Subproject commit b036b587216d89a0bf27f4e11ae4f453e8cce766 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 617bb58e..18f17fed 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 617bb58eb0b381ae6095fe8947bc7f9e25ef85b1 +Subproject commit 18f17fed89e1fd381ba9c3bf9a7b64d88cb62ad7 diff --git a/qtimageformats b/qtimageformats index 7625a06b..c7c320bf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7625a06bd7bfcf77e896086d049b334f1b66c75d +Subproject commit c7c320bf134e6df6a98f10c357ff36e2c8008e53 diff --git a/qtlocation b/qtlocation index eda2a7c2..09da28bb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eda2a7c286058176e1906d0ddc88d4e2cfbec55e +Subproject commit 09da28bb9acd11359424ae7b81114c991ce9d4f7 diff --git a/qtmacextras b/qtmacextras index 9f58d3af..52e2485e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9f58d3afbf3157bf9dcf3614a530fb8e179f60b9 +Subproject commit 52e2485ef1a10e6974f9603df414a4d649669240 diff --git a/qtmultimedia b/qtmultimedia index 457181d7..5e9db9c1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 457181d73c5bc188cfea13e13dbe930de3b993d3 +Subproject commit 5e9db9c117309e84adc5dba32f59a05760867558 diff --git a/qtnetworkauth b/qtnetworkauth index 72f5b40b..6ad275b1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 72f5b40b00178710b36edc7ed1769321182e7fa6 +Subproject commit 6ad275b1eb35c4e9d75e217adaad4f5101a3bb28 diff --git a/qtpurchasing b/qtpurchasing index 6ec39500..231e7e55 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00 +Subproject commit 231e7e55e9bb8a70bbb2c43ed3e92804ff5577b2 diff --git a/qtqa b/qtqa index 930a856e..ff87df77 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a +Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 diff --git a/qtquick3d b/qtquick3d index 145bca6e..962950bf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 145bca6ec8447cc2a6cf9b6afdee309d904e94ec +Subproject commit 962950bfb11458cfddb3b7271ea9516c2e498cdf diff --git a/qtquickcontrols b/qtquickcontrols index e9ad3352..f7b36543 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e9ad3352df0815761c1fde8ea36b040e8431f360 +Subproject commit f7b3654305a31fc5a4bbba2dbb3d13f6ba652b6a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 71757283..e2768b6d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 71757283972348971a79c905f9c8b1b42870d876 +Subproject commit e2768b6d054c62c21a343fe25557d3ff9e45d1d1 diff --git a/qtquicktimeline b/qtquicktimeline index 87d429e0..e40206c7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 87d429e0ada30197945a65a91fcaedd935a37ad0 +Subproject commit e40206c703c57f3c98263a7481597dfced5db6c1 diff --git a/qtremoteobjects b/qtremoteobjects index 9ec14db5..54ad6e29 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9ec14db5a9f735eb4286984f934568f089627bd7 +Subproject commit 54ad6e294d367a7e34e8a40022f6c520d7f6bb4a diff --git a/qtrepotools b/qtrepotools index d6e8ca40..8f06a503 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 +Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 diff --git a/qtscript b/qtscript index 36300dd0..ebd4605c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 36300dd06bb8191800ec93ca5a408f39b1f221eb +Subproject commit ebd4605c712941030edac8f5b7c32971e9541f7a diff --git a/qtscxml b/qtscxml index 85ef74c2..063f77e1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 85ef74c296716081b044db5fd9db4692443c229f +Subproject commit 063f77e160122da7ff720ca3971f9fd6d875982b diff --git a/qtsensors b/qtsensors index 3c7ddeee..d6d2de14 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837 +Subproject commit d6d2de144d1dadc41ded78a5eedb76d3d7ab5436 diff --git a/qtserialbus b/qtserialbus index 1274acb4..b12bc310 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1274acb4bf4cdd06781495f5d9f90adb7268c318 +Subproject commit b12bc31046b29d67a59ab6b28cbc61e03dea0712 diff --git a/qtserialport b/qtserialport index ff3fd7b0..48d52408 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ff3fd7b0330cb76772066ce7162320f4dc1a5c28 +Subproject commit 48d52408fcd640c2c5e6fcd537ff6b766849db14 diff --git a/qtspeech b/qtspeech index 1b67cc56..d9dbe04c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1b67cc563c3233df55c16ab9c23ba111233a365b +Subproject commit d9dbe04ce445b93c36ccfab4b5145d41cd4a58ff diff --git a/qtsvg b/qtsvg index 2c67415a..e12485f6 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c67415afc2e12bab958e16b18bcab88a537c248 +Subproject commit e12485f69e12fc382174a8d081fcb88c3567a4d3 diff --git a/qttools b/qttools index 1b992406..95cd9078 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b992406a6523a144c58baa9bbd1198bb9a2d98c +Subproject commit 95cd9078938bcd88fdfbba707911e8111f59f195 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b3556c25..4286d326 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b3556c25ffdc64595e41d005b091776035134846 +Subproject commit 4286d326885d629421c6d5511db8f9f619cc83f8 diff --git a/qtwayland b/qtwayland index 224f48fa..e72f7db3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 224f48fa0d5eb325f66769054ed3e8d0a24d862a +Subproject commit e72f7db39f58063267036a4e5d066e70a80184b2 diff --git a/qtwebchannel b/qtwebchannel index cbbb6c38..bb144ebc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cbbb6c38fa9b64e9e4eb98af0bf687ef469aa327 +Subproject commit bb144ebca2ea2fda8f2ee75e233979e6df2d37c6 diff --git a/qtwebengine b/qtwebengine index 3125f1ac..3c9609c9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3125f1ac3951c63c20110c7e3946ca281cebbdf3 +Subproject commit 3c9609c9b469a9d4ea4bfac9f9886d8eb2f4d0f6 diff --git a/qtwebglplugin b/qtwebglplugin index ab0d58ef..f1327aa3 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ab0d58ef0a2cd21eab7dc612004e416d3d55a78e +Subproject commit f1327aa34c68b1536247c37925a3cbb255f6f27a diff --git a/qtwebsockets b/qtwebsockets index 37203fab..d937c580 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 37203fab746060edaccea8abcddc181611ab0555 +Subproject commit d937c580ec5ce24a4aad6cc9e4927cad5a93acda diff --git a/qtwebview b/qtwebview index d47cad5c..6e84d7a8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d47cad5ca5c3788fedc0a53930e47efb869f9315 +Subproject commit 6e84d7a8cddde19aa2c752e7dacf4bc8f78eefbb diff --git a/qtwinextras b/qtwinextras index d5310efd..41f8d34e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d5310efd2fbbe9786a4257f3ada78381cb54da23 +Subproject commit 41f8d34efdf0113e774914db8e63d9e880f8264d diff --git a/qtx11extras b/qtx11extras index 8136ffdf..306a2b20 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583 +Subproject commit 306a2b20a8792079faf6dae864161f1b5cc6646f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0964e5c3..af8b0cfd 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0964e5c37395d7d5f6c50d1e659d3bc8f2707711 +Subproject commit af8b0cfdc85d593eb63eb9fe4d61b61ba6382e9d From d88858d98bf346888cce1c218c6864e3ca4f95cb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 Apr 2020 22:39:11 +0200 Subject: [PATCH 03/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 153ad09e..36ef8534 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 153ad09effc7388d331c478f0cfe697232a89705 +Subproject commit 36ef85341aacd225839d58880d3f388f31e3100c diff --git a/qtbase b/qtbase index 94b02f6c..9e83d268 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 94b02f6cb20fcb597416a46f7e2defced39fb774 +Subproject commit 9e83d268d6e0bd492fafad823a47cef57b7916c5 diff --git a/qtdeclarative b/qtdeclarative index 796f6e1e..7b9b44d8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 796f6e1e8e99ea1046ffe2a744cfd1dca1248258 +Subproject commit 7b9b44d8f45c57df1393960807497bd7286d3471 diff --git a/qtdoc b/qtdoc index dfd166b2..7cbe7f97 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dfd166b29c80e73f5b67c1a1cd05ae197a6d0b97 +Subproject commit 7cbe7f97ad7585c72b18f786b83122840f7159cc diff --git a/qtlocation b/qtlocation index 09da28bb..145a28ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 09da28bb9acd11359424ae7b81114c991ce9d4f7 +Subproject commit 145a28ad34837bee8ba3d2acd9932d1b7825fd78 diff --git a/qtlottie b/qtlottie index f5cc3184..eeac3807 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f5cc3184f30c9fa1b81d931430aaa4f6f23267a3 +Subproject commit eeac38075b17ae74821e9976d3dd37346a4f822c diff --git a/qtmultimedia b/qtmultimedia index 5e9db9c1..3ce4b38a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5e9db9c117309e84adc5dba32f59a05760867558 +Subproject commit 3ce4b38a7c6711ea378a56baec84b73da55a9c84 diff --git a/qtquick3d b/qtquick3d index 962950bf..e3d353b6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 962950bfb11458cfddb3b7271ea9516c2e498cdf +Subproject commit e3d353b6235d658689d65c3e6a5dc25cee430590 diff --git a/qtquickcontrols b/qtquickcontrols index f7b36543..c9b02709 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f7b3654305a31fc5a4bbba2dbb3d13f6ba652b6a +Subproject commit c9b0270985a64c9682ddf304d18a18dfb18c8944 diff --git a/qtremoteobjects b/qtremoteobjects index 54ad6e29..f68928c4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 54ad6e294d367a7e34e8a40022f6c520d7f6bb4a +Subproject commit f68928c439fac00b27e85c9ae3f7e3ec0dca2221 diff --git a/qtscxml b/qtscxml index 063f77e1..e72ad1f0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 063f77e160122da7ff720ca3971f9fd6d875982b +Subproject commit e72ad1f088d054678b7d70133fe702d91ae6b366 diff --git a/qtsensors b/qtsensors index d6d2de14..b084dc36 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d6d2de144d1dadc41ded78a5eedb76d3d7ab5436 +Subproject commit b084dc36e39d74e1e1039ecfac345c9b54964f40 diff --git a/qtserialport b/qtserialport index 48d52408..1c736fef 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 48d52408fcd640c2c5e6fcd537ff6b766849db14 +Subproject commit 1c736fefa6dd8868610ff9ae59cd7552f1c7a891 diff --git a/qttools b/qttools index 95cd9078..e967772f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 95cd9078938bcd88fdfbba707911e8111f59f195 +Subproject commit e967772fe884dd8a488a359c122c9cbae9d94c55 diff --git a/qttranslations b/qttranslations index 95ece410..b0be8ca6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 95ece41082b43ec1b85e33074229941f4db71bb7 +Subproject commit b0be8ca652f732439e562f75be372730e2452042 diff --git a/qtwayland b/qtwayland index e72f7db3..4bd13402 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e72f7db39f58063267036a4e5d066e70a80184b2 +Subproject commit 4bd13402f0293e85b8dfdf92254e250ac28094c7 diff --git a/qtwebengine b/qtwebengine index 3c9609c9..38cbd955 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3c9609c9b469a9d4ea4bfac9f9886d8eb2f4d0f6 +Subproject commit 38cbd955daeaa66201f17a6928a11972950ef154 diff --git a/qtwebview b/qtwebview index 6e84d7a8..d2e2dbea 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 6e84d7a8cddde19aa2c752e7dacf4bc8f78eefbb +Subproject commit d2e2dbeaf681a5a1b79808e1ed982ae6e4563ae4 From d9375784042aeabe3800c3b445c58da445db7b64 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Apr 2020 22:56:38 +0200 Subject: [PATCH 04/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 36ef8534..5e16aa06 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 36ef85341aacd225839d58880d3f388f31e3100c +Subproject commit 5e16aa067ac6a8b5f031ffcefc356777a0da34ad diff --git a/qtandroidextras b/qtandroidextras index b67ed634..455cddd6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b67ed634117e645b33e200fe4d6b4137f6399df2 +Subproject commit 455cddd68ff84ba54509bf7676f9b02bddb7d214 diff --git a/qtbase b/qtbase index 9e83d268..e6a39c13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9e83d268d6e0bd492fafad823a47cef57b7916c5 +Subproject commit e6a39c13bfe44719ee345419e98638e5f38fe7ee diff --git a/qtdeclarative b/qtdeclarative index 7b9b44d8..4204f543 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7b9b44d8f45c57df1393960807497bd7286d3471 +Subproject commit 4204f543eb82f96bf9f2b45b9b8b5e490517880b diff --git a/qtdoc b/qtdoc index 7cbe7f97..52e67b5b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7cbe7f97ad7585c72b18f786b83122840f7159cc +Subproject commit 52e67b5b4f42f821d411510c3b9675a23c9f5518 diff --git a/qtimageformats b/qtimageformats index c7c320bf..b26e5fbf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c7c320bf134e6df6a98f10c357ff36e2c8008e53 +Subproject commit b26e5fbf4c50b70ec773a0265c27bb3b262c71ed diff --git a/qtmultimedia b/qtmultimedia index 3ce4b38a..83f0038f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3ce4b38a7c6711ea378a56baec84b73da55a9c84 +Subproject commit 83f0038fa7fd090840fdd19fd30652bd7bbb6fd3 diff --git a/qtqa b/qtqa index ff87df77..a03bac72 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 +Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 diff --git a/qtquick3d b/qtquick3d index e3d353b6..cf29ed45 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e3d353b6235d658689d65c3e6a5dc25cee430590 +Subproject commit cf29ed45e8cc6ac59ff5ca391c1d05c7361a89c6 diff --git a/qtwayland b/qtwayland index 4bd13402..efc94a48 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4bd13402f0293e85b8dfdf92254e250ac28094c7 +Subproject commit efc94a48526baf92b8a78916e03e1fef5993fa95 diff --git a/qtwebengine b/qtwebengine index 38cbd955..32d2a122 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 38cbd955daeaa66201f17a6928a11972950ef154 +Subproject commit 32d2a1224f05d328ccf6988aa719511906852e12 diff --git a/qtwebsockets b/qtwebsockets index d937c580..6efa2ea5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d937c580ec5ce24a4aad6cc9e4927cad5a93acda +Subproject commit 6efa2ea5fd6eb35fd07b97f643d1e8e376f2eda0 From e2d2d25a570fe48d2eef840f4b2d2f83c09c42fb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Apr 2020 13:27:15 +0000 Subject: [PATCH 05/11] Update submodules on '5.15.0' in qt5 Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index e6a39c13..821e71fd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e6a39c13bfe44719ee345419e98638e5f38fe7ee +Subproject commit 821e71fded090d815b5cd396057ac9823874fe1f diff --git a/qtconnectivity b/qtconnectivity index 35fe7d45..eb908370 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e +Subproject commit eb908370e0c8212cf81f080f4bdbf663273b8063 diff --git a/qtdoc b/qtdoc index 52e67b5b..c09aafd6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 52e67b5b4f42f821d411510c3b9675a23c9f5518 +Subproject commit c09aafd6359c51d20c0504395bafc544a38b59a6 diff --git a/qtquick3d b/qtquick3d index cf29ed45..ba9d56b6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cf29ed45e8cc6ac59ff5ca391c1d05c7361a89c6 +Subproject commit ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a diff --git a/qttools b/qttools index e967772f..94e86110 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e967772fe884dd8a488a359c122c9cbae9d94c55 +Subproject commit 94e861104a1d689dfd12018e7be377699ab24917 diff --git a/qtwebengine b/qtwebengine index 32d2a122..950e462b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 32d2a1224f05d328ccf6988aa719511906852e12 +Subproject commit 950e462b1d369f8140a1d54078d42b5f057adfdb From 71043ca2438d49c1f9aa64b56cfd453dac384696 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 May 2020 10:33:12 +0300 Subject: [PATCH 06/11] Provisioning: Update expired QNX license Task-number: QTQAINFRA-3708 Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/qnx_700.sh | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 2 +- coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..f344c275 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" +sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..49b71837 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" From 8f653ce4f81887e574241823caf6065ec67a13b6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Apr 2020 14:53:47 +0300 Subject: [PATCH 07/11] Provisioning: Add sleep before killing gpg-agent in msys installation Task-number: QTQAINFRA-3691 Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920 (cherry picked from commit 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/windows/install-msys2.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index b26df151..784b09dc 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma Start-Sleep -s 30 cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. +# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. +Start-Sleep -s 180 if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } From db44923e30ec686030cdd4d8699444b5c2d2a2a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 May 2020 03:57:06 +0000 Subject: [PATCH 08/11] Update submodules on '5.15.0' in qt5 Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 821e71fd..6ebef2eb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 821e71fded090d815b5cd396057ac9823874fe1f +Subproject commit 6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e From d913a868d47815b87cc3b487b19ff459f5857e07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 May 2020 12:08:38 +0000 Subject: [PATCH 09/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: Ia3881b1668420fed08caf6a4fb8a8b957ac98789 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 6ebef2eb..a8b373d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e +Subproject commit a8b373d678f44a9d7006a412cabc75e7586b2c43 diff --git a/qtdeclarative b/qtdeclarative index 4204f543..829da623 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4204f543eb82f96bf9f2b45b9b8b5e490517880b +Subproject commit 829da623961b9d4e8c3a2236cb9580dec97c2483 diff --git a/qtlocation b/qtlocation index 145a28ad..b2d0a909 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 145a28ad34837bee8ba3d2acd9932d1b7825fd78 +Subproject commit b2d0a90961089057acf199119afa8235e9e926b3 diff --git a/qtnetworkauth b/qtnetworkauth index 6ad275b1..8e6e45b9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 6ad275b1eb35c4e9d75e217adaad4f5101a3bb28 +Subproject commit 8e6e45b990a0ad9bc0d43f1f5387d34a212441bd diff --git a/qtqa b/qtqa index a03bac72..62e2b16e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 +Subproject commit 62e2b16e1788fe4d5ea47480b130074a7eb38ae7 diff --git a/qtwebengine b/qtwebengine index 950e462b..387fb937 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 950e462b1d369f8140a1d54078d42b5f057adfdb +Subproject commit 387fb9377d61683bcd0f59a637afffdd9a16912c From d20eaafc5cfe6527fd7f176914d4d6f4074a3159 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 9 May 2020 11:31:05 +0000 Subject: [PATCH 10/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: I7237b1851b031f6b6ec8e949be1b2326228d379d Reviewed-by: Jani Heikkinen --- qtquick3d | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtquick3d b/qtquick3d index ba9d56b6..c9073f11 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a +Subproject commit c9073f11ba540353aa5e3a6f8653569daf9ed606 diff --git a/qtrepotools b/qtrepotools index 8f06a503..062a1654 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 +Subproject commit 062a16545b7c870e392ad9e6f0ce7976659d259e From 717364e3e10f39f602545c080f34baa064760b7a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 May 2020 13:43:51 +0000 Subject: [PATCH 11/11] Update submodules on '5.15.0' in qt/qt5 Change-Id: I5d348235045f06b87d3cef2752e87bfb5486ab50 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index a8b373d6..ba3b53cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a8b373d678f44a9d7006a412cabc75e7586b2c43 +Subproject commit ba3b53cb501a77144aa6259e48a8e0edc3d1481d diff --git a/qtdeclarative b/qtdeclarative index 829da623..5a3d9309 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 829da623961b9d4e8c3a2236cb9580dec97c2483 +Subproject commit 5a3d9309ec018445a3471d40366f41ee2f6ebef7