From 16249a5fceec0ceb27fe69e43c89a7f7c89c223b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 1 Nov 2017 13:58:30 +0100 Subject: [PATCH 1/8] Adjust submodule branches Change-Id: I1aafb2a8b674fabaefeee711cb15d0e959849be5 --- .gitmodules | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4988927..ca1544aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.3 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.3 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,101 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.9.3 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 + branch = 5.9.3 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 + branch = 5.9.3 status = preview [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.9.3 status = preview From ee4b7e638b8ab654fc0d27da88e9fc2a85c115d4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 Nov 2017 12:18:17 +0200 Subject: [PATCH 2/8] Update submodules on '5.9.3' in qt5 Change-Id: I1ff81c92c5e273e423788b3d0fff9afcaec23549 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 9f0dda29..28937559 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9f0dda29d5d070f63b7f098139f01f07ec91ffdf +Subproject commit 28937559b1e03f959cd012c6b42ca988311893f5 diff --git a/qtconnectivity b/qtconnectivity index 6029bad7..ca6b84af 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6029bad7d1007aecd155985ba13d6c23a01015b8 +Subproject commit ca6b84af1612440a925b4a8223cbed4beb9ac33e diff --git a/qtdeclarative b/qtdeclarative index 742e869a..75cc5fdc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 742e869afe2dbba6aae6302d20ba9c82f3ed99c6 +Subproject commit 75cc5fdc219c42ae26ec8497647eda5440c324f2 diff --git a/qtdoc b/qtdoc index 07446998..e4ccd4a7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 07446998a4d75ceb6376dd674b9e9426b170ae6b +Subproject commit e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 diff --git a/qtlocation b/qtlocation index 467bcda1..af2ea98b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 467bcda16b0589a75d6b81d4b475a90cecae129d +Subproject commit af2ea98b9a7555acf4d0d9c08a2edd489b613e72 diff --git a/qtmultimedia b/qtmultimedia index 5b42ce74..c3c6b7d0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5b42ce74199671f88ee82c971ebff70f87c018db +Subproject commit c3c6b7d0987b90e4a987ee84b2f31adf06568a0d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1d39e62a..f46776cc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1d39e62ada99d85a411e1d6fc26925e342f5b59b +Subproject commit f46776cc68f88a8cbc518cacf6c63f31f11d73b0 diff --git a/qtserialbus b/qtserialbus index 60c0114e..be9168ae 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 60c0114e846a593895503a78d13b006f93e95675 +Subproject commit be9168aebae32a86094e6dfcb32b454b4887ff33 diff --git a/qttools b/qttools index 779002b1..9df14033 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 779002b14dc2e9e4eb22f2c2c243f3da12fa4c72 +Subproject commit 9df140339230d92690758ebc3e3b6cc6c1a5e8e3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 49eabec1..19cae9dd 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 49eabec1a99b3b2a1db05cb46d5402015391cedb +Subproject commit 19cae9ddecbff856e5ff0e294402091db0c2484b diff --git a/qtwayland b/qtwayland index f1407493..bfd08f5e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f1407493d6d25f24a3c71fbcedc00598baa44b56 +Subproject commit bfd08f5ebd33e452c08595e5811698a16d3166fa From a8bd91bc277de146979372831347cede8e60b280 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 10 Nov 2017 12:50:41 +0200 Subject: [PATCH 3/8] Provisioning: Remove old cmake before installing new one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 x86 isn't yet vanilla so provisioning needs to remove old cmake before installation Change-Id: I2712aaa652492520d68a597d99a3c2d6bdbe2433 Reviewed-by: Iikka Eklund Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/cmake.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 1716467c..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -40,6 +40,9 @@ $zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" +echo "Removing old cmake" +Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue + Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" From f789a8004ac1a6b793fd9f712b7c775466f11c2d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 9 Nov 2017 13:40:19 +0100 Subject: [PATCH 4/8] Update submodules on '5.9.3' in qt5 Change-Id: I035628fed6f03353fd754ec21a293394709a0ce3 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/qt3d b/qt3d index 294eefef..252d2e5f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 294eefef0f8cfdba2edd73b5bd2ba7435b102ce5 +Subproject commit 252d2e5f2a237862cc50f926f66184d499298239 diff --git a/qtactiveqt b/qtactiveqt index cacf666f..b77dbef2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cacf666f95df9790cebf5d5cdb0609cee257fab3 +Subproject commit b77dbef218ba82aead596b48a1b0435c4a4e5a5e diff --git a/qtandroidextras b/qtandroidextras index 92e56ec2..e39ae426 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 +Subproject commit e39ae426534ee40ea14ffff6f2e0a59f55657e8d diff --git a/qtbase b/qtbase index 28937559..39355daa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28937559b1e03f959cd012c6b42ca988311893f5 +Subproject commit 39355daa40438eef386ce55f02e7ba9ff824993f diff --git a/qtcanvas3d b/qtcanvas3d index 2dd53f17..3ec47336 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2dd53f17ff626cd068be4cb04d793c53c71ed8f0 +Subproject commit 3ec47336f19a00e590c75ee520ff123266aa53b0 diff --git a/qtcharts b/qtcharts index ab6f94d6..def384b9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ab6f94d6fb186d0003679fb4541c939555fd01c9 +Subproject commit def384b950c7a21a14a4eaf27e5bfe9c487f7520 diff --git a/qtconnectivity b/qtconnectivity index ca6b84af..475d1bad 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ca6b84af1612440a925b4a8223cbed4beb9ac33e +Subproject commit 475d1bad05c14bfb06eb4472c2ba7b0f95bfa051 diff --git a/qtdatavis3d b/qtdatavis3d index 32fc1c7d..b9434577 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 +Subproject commit b94345779087f6598ab1204d6aebffa4ba581932 diff --git a/qtdeclarative b/qtdeclarative index 75cc5fdc..54f15f5d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 75cc5fdc219c42ae26ec8497647eda5440c324f2 +Subproject commit 54f15f5df5cf545bf4d675ccbafecd482b4a2b0b diff --git a/qtdoc b/qtdoc index e4ccd4a7..5fe2e2c4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 +Subproject commit 5fe2e2c4f3a797cddfecb0129f49a3d514eab800 diff --git a/qtgamepad b/qtgamepad index 0e2408a2..2ed733d1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0e2408a2729a5977182cb30d7e5ebd29a657673a +Subproject commit 2ed733d1cbf7cdafdc084f74e9897faad578f648 diff --git a/qtimageformats b/qtimageformats index feca51d8..18f057c2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit feca51d8c714781378cecc99122035348e0459bb +Subproject commit 18f057c28a169285dd9df18728baa152b22b29e3 diff --git a/qtlocation b/qtlocation index af2ea98b..714145e7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit af2ea98b9a7555acf4d0d9c08a2edd489b613e72 +Subproject commit 714145e7017afb74a23548ee9df2eff30536cfde diff --git a/qtmacextras b/qtmacextras index 25127376..3e3e76d5 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 25127376ff49055eec43039c9bf6795f58de1e94 +Subproject commit 3e3e76d53610b539d8cb174c8f205fd8a28a030d diff --git a/qtmultimedia b/qtmultimedia index c3c6b7d0..f771b34d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c3c6b7d0987b90e4a987ee84b2f31adf06568a0d +Subproject commit f771b34d7e288c172f773d440d9ee46e85548f2f diff --git a/qtquickcontrols b/qtquickcontrols index 296810ea..118c63b8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 296810ea4bb4f734881a517eb101e5b948c1905b +Subproject commit 118c63b8b5c129b2566f19b7931529fbe60850f8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f46776cc..d92fdd98 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f46776cc68f88a8cbc518cacf6c63f31f11d73b0 +Subproject commit d92fdd989fb0355f866356625cf7f68f06cf8280 diff --git a/qtremoteobjects b/qtremoteobjects index 1d95be3c..c10eaf91 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1d95be3c4a36b2e369b4ba3171581f0a7d5095ba +Subproject commit c10eaf9148ec111c3fb752cc15e854e5c7fd3ea7 diff --git a/qtsensors b/qtsensors index a8f64f49..5a762272 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a8f64f49ddffd44ca748bb25758d6aa3e71d48ef +Subproject commit 5a76227267a118cbda84cdee6d4fd3008ea5d34a diff --git a/qtserialbus b/qtserialbus index be9168ae..43845adc 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit be9168aebae32a86094e6dfcb32b454b4887ff33 +Subproject commit 43845adcb402b2a55cac423b142a9139b4cac17d diff --git a/qtserialport b/qtserialport index dd9fdb2b..f0d63a2f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 +Subproject commit f0d63a2f88ea88dcebdb1d9240006b35768f740d diff --git a/qttools b/qttools index 9df14033..87a54985 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9df140339230d92690758ebc3e3b6cc6c1a5e8e3 +Subproject commit 87a54985321a3b9785619cdeeef44fa469cce594 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 19cae9dd..e0d5dbf0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 19cae9ddecbff856e5ff0e294402091db0c2484b +Subproject commit e0d5dbf0b83d72109ff3e69b9ef64bb2e8dd6153 diff --git a/qtwayland b/qtwayland index bfd08f5e..916f9f84 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bfd08f5ebd33e452c08595e5811698a16d3166fa +Subproject commit 916f9f843f31329669a8ec4864c929179bc5f737 diff --git a/qtwebengine b/qtwebengine index 399d77a3..a87049cd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 399d77a38ff52d33dc871a5b221db253308b7436 +Subproject commit a87049cd7e188ea2185cf467765b60cb9de1210e diff --git a/qtwebsockets b/qtwebsockets index 203da360..67f6e5e2 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 203da360c4bcd64bdd17639d495f1857b622e92d +Subproject commit 67f6e5e282c21495794741dd2242e4965b716b96 diff --git a/qtwinextras b/qtwinextras index ea7de894..cbf856f7 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ea7de894f711d8fa4f6cf78b5a409889849ee1f2 +Subproject commit cbf856f70150cd5e9acb516353846a0eb4b466ed diff --git a/qtxmlpatterns b/qtxmlpatterns index b257f032..fedfe785 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b257f032350c555ea52a7dad5a52d0312ab93b5c +Subproject commit fedfe78518ad4025d9fafbd408e448311edbc478 From f0dd13f05a916b1a721349aca16215114c7e7337 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 14 Nov 2017 15:00:46 +0200 Subject: [PATCH 5/8] Update submodules on '5.9.3' in qt5 Change-Id: I887eab07a2d6d7b0314d14371c329edf1251d2a5 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtx11extras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 252d2e5f..6399bcf7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 252d2e5f2a237862cc50f926f66184d499298239 +Subproject commit 6399bcf7a9564f3566e160803f6f2837ce8727af diff --git a/qtbase b/qtbase index 39355daa..48702821 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 39355daa40438eef386ce55f02e7ba9ff824993f +Subproject commit 4870282117b43242d9c2cd6fbde8175b2a907b08 diff --git a/qtdeclarative b/qtdeclarative index 54f15f5d..d188cdd7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 54f15f5df5cf545bf4d675ccbafecd482b4a2b0b +Subproject commit d188cdd7378e0e8b384fa812b5907638075d1206 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7ab12ad1..cb007fee 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7ab12ad1483607cf3f007c591e998f40f2ec9513 +Subproject commit cb007fee657f8bc2e48c3c1969834114e06a4307 diff --git a/qtlocation b/qtlocation index 714145e7..64e8ed5f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 714145e7017afb74a23548ee9df2eff30536cfde +Subproject commit 64e8ed5fa20d343904a27ad86411223504367e89 diff --git a/qtpurchasing b/qtpurchasing index 34ab68ce..db01129b 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 34ab68cee42e0ad3033e5a1831b0ca20b5761461 +Subproject commit db01129bf01d77f714fc43bda55398ae63e92c61 diff --git a/qtqa b/qtqa index 50691867..baa79eab 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5069186722a01ea4f47d13fb79f6939428dcc2e4 +Subproject commit baa79eab7734031569fef9a4c1bf802fc2137f2f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d92fdd98..2eb1d259 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d92fdd989fb0355f866356625cf7f68f06cf8280 +Subproject commit 2eb1d259c6441faa62dc1834664e71995dca9165 diff --git a/qtscxml b/qtscxml index 113b502b..04a0d00d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 113b502b194d6d7573b9f86f400bdf481e98cf74 +Subproject commit 04a0d00d41087c431626cc82f6f01297b6d31e1d diff --git a/qtwebchannel b/qtwebchannel index 87044174..10a27047 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 87044174033f141d8d333e2a442d826d87db0415 +Subproject commit 10a2704788f0bdf8dad3f7872db11f76ca2f4a18 diff --git a/qtwebengine b/qtwebengine index a87049cd..bc6915f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a87049cd7e188ea2185cf467765b60cb9de1210e +Subproject commit bc6915f0ae19a5bd5223b2b722c4c7f684972e4f diff --git a/qtwebview b/qtwebview index 71932e38..abc6a559 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 71932e381ee12528f6516f61c5467f322d8ee903 +Subproject commit abc6a559f2369e82018568ece2b2dcce268e3777 diff --git a/qtx11extras b/qtx11extras index f21ef0cd..2ee45df9 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f21ef0cd01ccf1ccdbb2211eb935aff402741969 +Subproject commit 2ee45df917c1c3b93a4584d5bb3e887dba55fed8 From 08765d925832e8eb7210df28ecc27e8f12a15712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 16 Nov 2017 09:07:09 +0200 Subject: [PATCH 6/8] provisioning: RHEL7.4: Add Python3 Python3 is currently not installed in RHEL7.4 provisioning. Change-Id: I788b7f40ab7731f50f98f15defaac13f0296b54e Reviewed-by: Heikki Halmet --- .../08-pythondev.sh | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh new file mode 100755 index 00000000..6ae0f820 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + +set -ex + +packageEpel="epel-release-latest-7.noarch.rpm" +OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" +CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" +SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" + +DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel +sudo rpm -Uvh $packageEpel +sudo rm -f $packageEpel + +# install python3 +sudo yum install -y python34-devel + +# install pip3 + +packagePip="get-pip.py" +OfficialUrlPip="https://bootstrap.pypa.io/$packagePip" +CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip" +SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d" + +DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip +sudo python3 $packagePip +sudo rm -f $packagePip +sudo pip3 install virtualenv + From ecc7d251fa69044d3ce8d2d5f83e5729e5d8ef4c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Nov 2017 08:50:24 +0200 Subject: [PATCH 7/8] Update submodules on '5.9.3' in qt5 Change-Id: Id2262d4cad8e8ee526365d221c8620a7cd3ac053 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 48702821..4d8ae444 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4870282117b43242d9c2cd6fbde8175b2a907b08 +Subproject commit 4d8ae444c2b15ec7da5ef133aa5ad5a548180e21 From 63bda0c988cad19d3a1d6906fdf3e75af1ee84b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Nov 2017 22:26:40 +0200 Subject: [PATCH 8/8] Update submodules on '5.9.3' in qt5 Change-Id: I88eccfead04f469fe0fae41ac2a8bd8c3bbf1a3b Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index d188cdd7..08778586 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d188cdd7378e0e8b384fa812b5907638075d1206 +Subproject commit 08778586413adad7b3af35c7cb97416757d599c0 diff --git a/qtrepotools b/qtrepotools index ad7346df..bcb02535 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ad7346df2ee44889eb9aad1d6781edf4aa7c3ef2 +Subproject commit bcb02535bcfff8fb867b632705195435c2c5cb16