From 3bb63c22c4d79c7f12ba9c65b20be7a9a04c223c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 2 Nov 2018 15:29:23 +0100 Subject: Adjust submodule branches Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9ac0ec9c..c2c9e5e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = 5.11.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = 5.11.3 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = 5.11.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,77 +121,77 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -204,108 +204,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = 5.11.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = 5.11.3 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = 5.11.3 status = preview -- cgit v1.2.3 From c17352fc1280bdd420664223c6a944f025b1e481 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Nov 2018 13:40:39 +0100 Subject: Update submodules on '5.11.3' in qt5 Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 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 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index 33146940..d4835713 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3314694004b825263c9b9f2d69bd85da806ccbbc +Subproject commit d4835713b808503ab6d3039f3893355804a8a21d diff --git a/qtactiveqt b/qtactiveqt index 52637083..4cfbe403 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 52637083eeaa1ab4b9468813a28d40feea81ab5e +Subproject commit 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d diff --git a/qtandroidextras b/qtandroidextras index f7df383a..16d33f91 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f7df383a284e2189f0137efd9d9496f2be79566b +Subproject commit 16d33f91eadadc63e4a999fb175ed67b3321e9b7 diff --git a/qtbase b/qtbase index c9d18d4a..c69f4359 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c9d18d4a9c9d1243a267316e2a702f9ba69de2fd +Subproject commit c69f43594fc921fea82377e7b31a7f55f718051d diff --git a/qtcanvas3d b/qtcanvas3d index 96a47ce9..6f0a1143 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 96a47ce9de9e61ca92561160bc6d586c156094d2 +Subproject commit 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 diff --git a/qtcharts b/qtcharts index b90ea4a9..1bf73796 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b90ea4a947a5fe808cba8a12e3c9e9864ffdaa20 +Subproject commit 1bf73796a92ccd1599e5c762b73a76e545e48262 diff --git a/qtconnectivity b/qtconnectivity index 5f30c774..d1cf8dad 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5f30c77484a9af223d32067f579d440010520eb2 +Subproject commit d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a diff --git a/qtdatavis3d b/qtdatavis3d index 191ef6d8..7b091d13 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 191ef6d87362a5285d34ece4c48655408b2daa12 +Subproject commit 7b091d13ed5509a73da921a7ed30034a7eb55131 diff --git a/qtdeclarative b/qtdeclarative index 4a886753..7eaa9368 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4a886753a75c7c4d66f1fa9cab5a6c5a03240df3 +Subproject commit 7eaa93680ce583354f23f3b29bd6db59169dfece diff --git a/qtdoc b/qtdoc index c6e73db4..44be9a77 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c6e73db4f577f2076e6ad4b542f7dab08b744659 +Subproject commit 44be9a776a6efd29fb58b41478eb92bc33dfc1f5 diff --git a/qtgamepad b/qtgamepad index e3b436f6..e542b1b6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e3b436f6718e666f4c5baa3b768993382809e1ed +Subproject commit e542b1b6c46e49baec66d427a2664cc2c6aefa01 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 965da52a..7e2544e2 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 965da52a583a27fc41a489a4141f78c3acb0d143 +Subproject commit 7e2544e28cac2fbf7176b6692dacc57096774249 diff --git a/qtimageformats b/qtimageformats index 8455ab6c..2f61f401 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8455ab6cb29fcccf44977c517689a8ad26781140 +Subproject commit 2f61f401187d55bb0304591f27792a63a38db00e diff --git a/qtlocation b/qtlocation index 6b109d09..25c6840f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6b109d09982e09940dc8e777430a04410d7b6550 +Subproject commit 25c6840ff6585ca9f7ab1c168cdcdd18a68c7885 diff --git a/qtmacextras b/qtmacextras index 19e8855c..4b318dbb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 19e8855c9a47753313aa361b202a36703401fce1 +Subproject commit 4b318dbbb95f4ca60782846ec4b59422953900e7 diff --git a/qtmultimedia b/qtmultimedia index fc33195f..d9bf5685 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fc33195f87d7b2b036f1df625a8fda12557e05e4 +Subproject commit d9bf568551c9e101374ba842e831650d34d0d41e diff --git a/qtnetworkauth b/qtnetworkauth index f76f07ee..ffb63277 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f76f07ee7328b8d402bf0b12aa99023b8955d4ed +Subproject commit ffb63277ac2ac90b4a99a710660d5e66920a8c5a diff --git a/qtpurchasing b/qtpurchasing index e5ae8515..d7257f75 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e5ae8515422fd0cc7cf9aa91c8b0c38fa53fd9a9 +Subproject commit d7257f75e1e9f89a2934c50784d76d90f919605f diff --git a/qtquickcontrols b/qtquickcontrols index d7611760..cf957e40 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d76117604a9e04a9a66c0279687cc7dc54b9dc68 +Subproject commit cf957e407030fc260bd86882cf2f79724126abdd diff --git a/qtremoteobjects b/qtremoteobjects index a0263f7a..9fcf2a90 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a0263f7a09bd5b9c0d2d0f37f3037293c0a6f921 +Subproject commit 9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087 diff --git a/qtscript b/qtscript index eb287106..ebe11c8e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit eb28710655e4cf1059ec450527061d777fcb867e +Subproject commit ebe11c8e867bb65ad7cb1424fe4c096935741089 diff --git a/qtscxml b/qtscxml index 4f6797ac..a5effbcb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4f6797ac018f931f3655a53ca5d4ca0114f321e0 +Subproject commit a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 diff --git a/qtsensors b/qtsensors index 58854bdb..a4c3631b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 58854bdb19cfff1c66788a3035f2aa12b34cce00 +Subproject commit a4c3631b0bb895b854305ecf2a4632dc949ef2d3 diff --git a/qtserialbus b/qtserialbus index 864e4a8a..200822ca 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 864e4a8ab514ddcd7f79106a6b447f7a1d5b5d4e +Subproject commit 200822ca61732693cc97802b953cd846654eb319 diff --git a/qtserialport b/qtserialport index 3f028584..74222a0e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3f0285847230151026890e668b2ff13944b902ee +Subproject commit 74222a0e38687068970c8492d794cf92b898c6b6 diff --git a/qtspeech b/qtspeech index 311b5ca4..09a6b3cd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 311b5ca4c814e6ec54b598d88f1faf7999b11fb5 +Subproject commit 09a6b3cdbef71a56591d2fdeaa2af93199db83cf diff --git a/qtsvg b/qtsvg index 32c93cbc..a844c1c3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 32c93cbca8b2f337e0801537d52e416289b3f464 +Subproject commit a844c1c36551665f19be8a69c0e5e608d24f3a8e diff --git a/qttools b/qttools index 10263f42..ab73d888 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 10263f42de0d2d1fb731deb4213b76fa6c0acd0f +Subproject commit ab73d888c4f41a0d0993abca18680cdcbd79b444 diff --git a/qttranslations b/qttranslations index 60de15a0..ed511017 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 60de15a0e0121096239cf6031250d2862e77971d +Subproject commit ed5110171ca294207f341f46610c716170c06282 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c7a94110..eb9e0957 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c7a94110987672308ed04b40fd8ed207d1c8d93b +Subproject commit eb9e095722e1d953d3bf17bad73f528ac9061488 diff --git a/qtwayland b/qtwayland index 297bcd00..dccec9b2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 297bcd005c4205f69e1bf9e9dc565ab757cf0bac +Subproject commit dccec9b282ae15fa65fd61698dd1cb47325e5c8e diff --git a/qtwebchannel b/qtwebchannel index daecad4c..faab35b4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit daecad4cc7552cff68aa6c87cd78cb3b7a0d73f6 +Subproject commit faab35b4f88c634510e56adcfa6f12f0fef548bb diff --git a/qtwebengine b/qtwebengine index efa90d94..3c88531c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit efa90d944170f0a2f98c482825b9809c77e7792c +Subproject commit 3c88531c3d40c43cd9ac5dc9954668330dab52c1 diff --git a/qtwebglplugin b/qtwebglplugin index 9a19f140..4519f095 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9a19f14013519f3c00a53b4204c7a7d1b2d0acc5 +Subproject commit 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 diff --git a/qtwebsockets b/qtwebsockets index e71467cb..bac5a376 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e71467cb569c8d1453e023701b17c9ce9e3fdb86 +Subproject commit bac5a37663249edb9a9746687a7128c013af0309 diff --git a/qtwebview b/qtwebview index e54a993e..8970865f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e54a993e028039be93a46c5decf00194d898b9c4 +Subproject commit 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 diff --git a/qtwinextras b/qtwinextras index f072c959..b1429b32 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f072c959a055b6140297c1bb8deba746ce8c6b72 +Subproject commit b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 diff --git a/qtx11extras b/qtx11extras index 295c13f5..25abe51f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 295c13f5779795c5ec49c7a1ada70287707a8fd6 +Subproject commit 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 diff --git a/qtxmlpatterns b/qtxmlpatterns index 15e22118..af06f4fb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 15e22118d01ae39722d1836715fe9cf8b6d3ee88 +Subproject commit af06f4fbf76ef6168529f5de4480d4afd2cf204b -- cgit v1.2.3 From caf4c589417d8a9abf3f9f9009055259de59f4d8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Nov 2018 21:31:17 +0100 Subject: Update submodules on '5.11.3' in qt5 Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 3c88531c..97687f9b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3c88531c3d40c43cd9ac5dc9954668330dab52c1 +Subproject commit 97687f9bdf9eba7ce06f0813f6df3e9ed65e95d5 -- cgit v1.2.3 From fbf22546be94446c183a2354fda5dfb1261547f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Nov 2018 14:19:19 +0100 Subject: Update submodules on '5.11.3' in qt5 Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90 Reviewed-by: Liang Qi --- qtquickcontrols2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d56c193e..e236382e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d56c193eb4ceb640611d66f22e1f26aae91cd7d1 +Subproject commit e236382e8cc1017597ae67bf739e91a2bd4dfd0a -- cgit v1.2.3 From 5c4d85a9b9e239f2fe1dcfea4df294c888358be8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Nov 2018 20:32:46 +0100 Subject: Update submodules on '5.11.3' in qt5 Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/qt3d b/qt3d index d4835713..cd3e621c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d4835713b808503ab6d3039f3893355804a8a21d +Subproject commit cd3e621ccf56bb8262f9c8cd967e05bf41934060 diff --git a/qtactiveqt b/qtactiveqt index 4cfbe403..61be6aaf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d +Subproject commit 61be6aaf05d2c57f8fbb504370467367982c5bf2 diff --git a/qtcanvas3d b/qtcanvas3d index 6f0a1143..8726c868 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 +Subproject commit 8726c86872134cf4b4396fa5e7ca8eba4ef37ed4 diff --git a/qtcharts b/qtcharts index 1bf73796..444aeb81 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1bf73796a92ccd1599e5c762b73a76e545e48262 +Subproject commit 444aeb81f2555a37d94862ceaaa8295c5c7ddddd diff --git a/qtdatavis3d b/qtdatavis3d index 7b091d13..a04bbfd9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7b091d13ed5509a73da921a7ed30034a7eb55131 +Subproject commit a04bbfd93159963aa505f96425e85a2a83b0b10a diff --git a/qtdeclarative b/qtdeclarative index 7eaa9368..e3c0bb78 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7eaa93680ce583354f23f3b29bd6db59169dfece +Subproject commit e3c0bb7811407bad1f65ea55639a4b1d1d39be15 diff --git a/qtgamepad b/qtgamepad index e542b1b6..4005b78c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e542b1b6c46e49baec66d427a2664cc2c6aefa01 +Subproject commit 4005b78c2bde8fd9cf1cbe3155cbe6c33f576111 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7e2544e2..d560b79d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7e2544e28cac2fbf7176b6692dacc57096774249 +Subproject commit d560b79d050659715159d5f04b2e96fd38d0230c diff --git a/qtimageformats b/qtimageformats index 2f61f401..43403038 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2f61f401187d55bb0304591f27792a63a38db00e +Subproject commit 43403038cf75086409bf7ee485ae855fd4c1c1e1 diff --git a/qtmacextras b/qtmacextras index 4b318dbb..9c6ac88d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 4b318dbbb95f4ca60782846ec4b59422953900e7 +Subproject commit 9c6ac88da0509a220dd654d5caa53ff7c87a39d6 diff --git a/qtmultimedia b/qtmultimedia index d9bf5685..6966a09c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9bf568551c9e101374ba842e831650d34d0d41e +Subproject commit 6966a09c9a6a2c134a739446cc582e47d0c6ed6d diff --git a/qtnetworkauth b/qtnetworkauth index ffb63277..90ae677b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ffb63277ac2ac90b4a99a710660d5e66920a8c5a +Subproject commit 90ae677b45570e45adc9d03ba9967065fdfa0432 diff --git a/qtpurchasing b/qtpurchasing index d7257f75..d11d7ff9 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d7257f75e1e9f89a2934c50784d76d90f919605f +Subproject commit d11d7ff9eff2a68441ff6264b04f37bd862bdd64 diff --git a/qtquickcontrols b/qtquickcontrols index cf957e40..6b7f91c0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cf957e407030fc260bd86882cf2f79724126abdd +Subproject commit 6b7f91c097f7e47cf2683d08b5838fd061a872bd diff --git a/qtremoteobjects b/qtremoteobjects index 9fcf2a90..92ae7296 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087 +Subproject commit 92ae729691f6db9fb06b0475509dc1141ac3d93c diff --git a/qtscript b/qtscript index ebe11c8e..cf09bc72 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ebe11c8e867bb65ad7cb1424fe4c096935741089 +Subproject commit cf09bc7285793d81a9755bf7e807c9d51d47d980 diff --git a/qtscxml b/qtscxml index a5effbcb..b99d699a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 +Subproject commit b99d699a8e1fe1a2968edafa6f0154a2581c2143 diff --git a/qtsensors b/qtsensors index a4c3631b..0dab0ff3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a4c3631b0bb895b854305ecf2a4632dc949ef2d3 +Subproject commit 0dab0ff3d33292bc1647ebb68dbeb8556707b5ad diff --git a/qtserialbus b/qtserialbus index 200822ca..857ed94b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 200822ca61732693cc97802b953cd846654eb319 +Subproject commit 857ed94b55b59859f41c55076c51e92f163cb9f7 diff --git a/qtserialport b/qtserialport index 74222a0e..5e3f1365 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 74222a0e38687068970c8492d794cf92b898c6b6 +Subproject commit 5e3f1365813079f1a9a9af284b6a40bd9df8e1c0 diff --git a/qtspeech b/qtspeech index 09a6b3cd..e596e640 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 09a6b3cdbef71a56591d2fdeaa2af93199db83cf +Subproject commit e596e640b0eeb32739c6a04459308e1d6bb9c834 diff --git a/qtsvg b/qtsvg index a844c1c3..ab492718 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a844c1c36551665f19be8a69c0e5e608d24f3a8e +Subproject commit ab492718dec3b54fce736b642dc6975d9b0046af diff --git a/qtwayland b/qtwayland index dccec9b2..9ce3088d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dccec9b282ae15fa65fd61698dd1cb47325e5c8e +Subproject commit 9ce3088d226fddc18bcac170fa5cc5be3c29e371 diff --git a/qtwebchannel b/qtwebchannel index faab35b4..94fee0ea 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit faab35b4f88c634510e56adcfa6f12f0fef548bb +Subproject commit 94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc diff --git a/qtwebengine b/qtwebengine index 97687f9b..64a4c839 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 97687f9bdf9eba7ce06f0813f6df3e9ed65e95d5 +Subproject commit 64a4c8395f9314c9548b6b0cd4a644e68692bf4b diff --git a/qtwebglplugin b/qtwebglplugin index 4519f095..b57a3ce9 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 +Subproject commit b57a3ce9d95f36ca0f1b1d1e9cf1e20030e882d8 diff --git a/qtwebsockets b/qtwebsockets index bac5a376..395c1f1a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bac5a37663249edb9a9746687a7128c013af0309 +Subproject commit 395c1f1aed90f740f079d8f980c93f459b44733a diff --git a/qtwebview b/qtwebview index 8970865f..779bf9c3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 +Subproject commit 779bf9c3f24365df3f681a029cafd78c7991e929 diff --git a/qtwinextras b/qtwinextras index b1429b32..537d8b04 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 +Subproject commit 537d8b04e002b5e47df9a60cb4f9b888311c61d8 diff --git a/qtx11extras b/qtx11extras index 25abe51f..877c585b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 +Subproject commit 877c585bc474934e3bb1044293a62c72cb01b9cf diff --git a/qtxmlpatterns b/qtxmlpatterns index af06f4fb..657995db 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit af06f4fbf76ef6168529f5de4480d4afd2cf204b +Subproject commit 657995db766faa48084024e780c4cd02fa05c527 -- cgit v1.2.3 From 76b9b7dbd3537b4cb6039a808bd3560c94f64c5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Nov 2018 05:43:18 +0000 Subject: Update submodules on '5.11.3' in qt5 Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index c69f4359..08de243e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c69f43594fc921fea82377e7b31a7f55f718051d +Subproject commit 08de243eaa007597c2bfbc97d3d14e2f821ac4be diff --git a/qtdoc b/qtdoc index 44be9a77..66bddfb5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 44be9a776a6efd29fb58b41478eb92bc33dfc1f5 +Subproject commit 66bddfb570e0ccb79ee35636129c350af09d503c diff --git a/qtimageformats b/qtimageformats index 43403038..335dc6af 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 43403038cf75086409bf7ee485ae855fd4c1c1e1 +Subproject commit 335dc6af7d24c1731cbd7e03a21e66c70d81760d diff --git a/qtlocation b/qtlocation index 25c6840f..ffac0dc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 25c6840ff6585ca9f7ab1c168cdcdd18a68c7885 +Subproject commit ffac0dc5a60c93663f6a4ea5483422c58cdb52b6 diff --git a/qtqa b/qtqa index 184d74f4..bf81b426 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 184d74f49c9951b1525066091088240a997c6092 +Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e236382e..431d605e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e236382e8cc1017597ae67bf739e91a2bd4dfd0a +Subproject commit 431d605edb48321c71935fbd2bb82d33e231ea55 diff --git a/qttools b/qttools index ab73d888..ddc4fba7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ab73d888c4f41a0d0993abca18680cdcbd79b444 +Subproject commit ddc4fba789c21bd0ebca180fa9d7cde399a49e37 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eb9e0957..a8cab520 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eb9e095722e1d953d3bf17bad73f528ac9061488 +Subproject commit a8cab520dc7bedff73ec60a5a189b21cdf01f083 diff --git a/qtwebengine b/qtwebengine index 64a4c839..18412af9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 64a4c8395f9314c9548b6b0cd4a644e68692bf4b +Subproject commit 18412af977d658f243eb5b25b62284924cfa362f -- cgit v1.2.3 From 1deea3debce6bfd0fd45545b3a8e1de80380a9a5 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 19 Oct 2018 11:01:36 +0300 Subject: Provisioning: Update openssl to version 1.0.2p MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält (cherry picked from commit 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969) Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 4 ++-- coin/provisioning/common/windows/openssl.ps1 | 6 +++--- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 353722f2..09d0b6d5 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2o" +version="1.0.2p" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" installFolder="/home/qt/" -sha="a47faaca57b47a0d9d5fb085545857cc92062691" +sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}o" "${opensslHome}" +mv "${opensslHome}p" "${opensslHome}" pushd "$opensslHome" echo "Running configure" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d838fcc8..15fe29f8 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -39,9 +39,9 @@ # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.0.2o" +$version = "1.0.2p" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691" +$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c" $destination = "C:\Utils\openssl-android-master" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 50bee891..4cc6a3b3 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_0_2o" +$version = "1_0_2p" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "86c71a28eda53fa406b957dd37491d616344b464" + $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 8532f99a..f836cf1d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -opensslVersion="1.0.2o" +opensslVersion="1.0.2p" opensslFile="openssl-$opensslVersion.tar.gz" opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691" +opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Below target location has been hard coded into Coin. # QTQAINFRA-1195 -- cgit v1.2.3