From 16249a5fceec0ceb27fe69e43c89a7f7c89c223b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 1 Nov 2017 13:58:30 +0100 Subject: [PATCH 01/18] 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 94ce4209567a5d4b614b932f09b43dd5286563b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 7 Nov 2017 16:58:57 +0100 Subject: [PATCH 02/18] Adjust submodule branches Change-Id: Ia4636256e7797beffbbdddb21f2f6b4839e1020b --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3d8128eb..3e1a942f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = 5.10.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = 5.10.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = 5.10.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = 5.10.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = 5.10.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = 5.10.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = 5.10.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = 5.10.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = 5.10.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = 5.10.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = 5.10.0 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = 5.10.0 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 03/18] 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 04/18] 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 05/18] 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 06/18] 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 07/18] 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 08/18] 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 09/18] 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 From 5d6f3486bc948346f9fd351138656e48fcbe6b09 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Nov 2017 13:57:25 +0100 Subject: [PATCH 10/18] Update submodules on '5.10.0' in qt5 Change-Id: I29389744d77591850f3b50ba5bec3b97bd5865b0 Reviewed-by: Oswald Buddenhagen 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 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index aad54453..a2c7dbba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit aad54453595e7fe857b1ab3db5b72b40bef2700a +Subproject commit a2c7dbba0ad60cf17997f77372004339d4580a52 diff --git a/qtactiveqt b/qtactiveqt index c9acfe0b..99611af4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda +Subproject commit 99611af4845e4c7893a03c0b13f2fd2275f318e3 diff --git a/qtandroidextras b/qtandroidextras index ae4f854d..64f26453 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ae4f854d754ea189be13ef740d631fdb7a72c9a5 +Subproject commit 64f2645337429e2af9ac345872c67b5354e3be10 diff --git a/qtbase b/qtbase index 3e5dde47..bb3872d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e5dde4766780665c1030003e3af3aefb75c5dbf +Subproject commit bb3872d60975724a50ff910b6dd108d1944db597 diff --git a/qtcanvas3d b/qtcanvas3d index af33e20a..ff91031e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit af33e20a04f3228f7bf39137b1cfbbf3cdf68544 +Subproject commit ff91031e167f51d7f75adc71ded91e9291fbfb77 diff --git a/qtcharts b/qtcharts index 93ac0acb..afd07787 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 93ac0acba1baa63a4709e623a7790349df41c299 +Subproject commit afd077876bd5203944a3ed73f4f1fb998f795ee2 diff --git a/qtconnectivity b/qtconnectivity index 6efa28f0..7eb9db93 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6efa28f0c193adf0151bb78d9660fa1fe6e8c525 +Subproject commit 7eb9db93aea072dae984d127caa532090abbdb07 diff --git a/qtdatavis3d b/qtdatavis3d index 190687f6..966bdad4 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 190687f649bae0cb954652637255042f716fd110 +Subproject commit 966bdad4d56ebb06e94aa8f33cb70f15ec288976 diff --git a/qtdeclarative b/qtdeclarative index 853b4b08..ef10b82a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 853b4b08d54f70d04d371d707e50760ffecf2f77 +Subproject commit ef10b82a28114718591bcdabec031ce05caacf37 diff --git a/qtdoc b/qtdoc index f9cfb3d4..664965b6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f9cfb3d4f11203e50dc0b6516fbbcb2d16d8b585 +Subproject commit 664965b6def2e1161551b8db2fcc1d2bf1b28c10 diff --git a/qtgamepad b/qtgamepad index 69dd73ad..2c9609cb 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 69dd73addc68b5d0dea986799a18d380de59a688 +Subproject commit 2c9609cb0a5ba41fbffbca3dba80b65a15509937 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ffd05a99..7576f0e2 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ffd05a99843216878e61c2e2c11e317f3f9fdfae +Subproject commit 7576f0e27e9d34f084caeb83281f1a4a6e0965dd diff --git a/qtimageformats b/qtimageformats index e5c4a6f8..4d4de2e0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e5c4a6f82b83a1bf27380c071e822d5303642824 +Subproject commit 4d4de2e070178510afb7f160c2594ae7af34f782 diff --git a/qtlocation b/qtlocation index 0cecbf08..485a631f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0cecbf084f805ddfd114370b2d8f5a107602971d +Subproject commit 485a631f2ae06e3328176049c51053e3047448bb diff --git a/qtmacextras b/qtmacextras index 74ca0bd1..a31b643d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 74ca0bd1b317399fbab08ed71e46307f78c0b07c +Subproject commit a31b643d92174465461194acc2919ec177c3995a diff --git a/qtmultimedia b/qtmultimedia index a383e038..3f0adfb1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a383e038116654cebb3105554dfff8915b0b3f70 +Subproject commit 3f0adfb1fba203580999496d7e4ca53e7aeb7621 diff --git a/qtnetworkauth b/qtnetworkauth index 2634ca88..febebfb6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2634ca886f6f4dbacebae5f80641b46e06d86854 +Subproject commit febebfb6f09f23b16ac96a5a09d2ceb5b67046e7 diff --git a/qtpurchasing b/qtpurchasing index 525751ea..4358df9b 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 525751ea4f24b8e3e2fa37beed47c391926d4319 +Subproject commit 4358df9bef910c63400cf0dcfc58aa404fb8f1ad 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/qtquickcontrols b/qtquickcontrols index 1320f7f9..87859b2a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1320f7f9840e94db66988f2dce265dfd373add27 +Subproject commit 87859b2aecbecdab8fd001e3a52887980b0735e8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 442843db..fe450538 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 442843db6f5dce6b594448d43b380c9b884a7c91 +Subproject commit fe4505386f7136f9475099901b4770bfb566818d diff --git a/qtremoteobjects b/qtremoteobjects index fee86745..e6eb6ab1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit fee8674500d829898a4347e2ea77690e04b11b22 +Subproject commit e6eb6ab12daf76f3e716c0d51ceecdab61e39e48 diff --git a/qtrepotools b/qtrepotools index ad7346df..bcb02535 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ad7346df2ee44889eb9aad1d6781edf4aa7c3ef2 +Subproject commit bcb02535bcfff8fb867b632705195435c2c5cb16 diff --git a/qtscxml b/qtscxml index 2143fd33..4f94bae7 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2143fd3362cc294c3076f879ef20c70ed3683f33 +Subproject commit 4f94bae73ccabfc714d248c6371f1883aacc1aa8 diff --git a/qtserialbus b/qtserialbus index 3e71f12d..fbfc5d78 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3e71f12de6995b2d9aa77b78f86251e49de8b2c5 +Subproject commit fbfc5d7877fa22365484c6e951e60f37b9aaa2a5 diff --git a/qtserialport b/qtserialport index c48e84e9..b0948ec0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c48e84e97ec5bf03ffc85625fe884042aa6b2e26 +Subproject commit b0948ec06644dd88ba8ec660c1fb39c49a6d0e70 diff --git a/qtsvg b/qtsvg index f1ba9514..984ba697 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f1ba95141c54b452edd737e9adb3461f303eb850 +Subproject commit 984ba6977201f8fbd94d44a2b67519e1faf458cc diff --git a/qttools b/qttools index 4e612c7d..6491ca02 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4e612c7d3dbfebfaf3eac346aa5261760871a799 +Subproject commit 6491ca02253f3245333611cabf248ef01bd31883 diff --git a/qttranslations b/qttranslations index c24bb936..0d153fe5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c24bb936786b8da06db998a1ba2193ce3460d5b1 +Subproject commit 0d153fe51ba4dc4ace8e8308b8e9ea478c75ffa0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 787721b7..5fe00843 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 787721b75c9af2c235e0a88550fda638593a1a0e +Subproject commit 5fe00843cf15c60870cd22b8cd039b6f249cf396 diff --git a/qtwayland b/qtwayland index 3ae8e08d..b6ac922f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3ae8e08df33e017f5be91b68118093776c46788c +Subproject commit b6ac922f1af207725e91fe5de0ea3ad0919d8026 diff --git a/qtwebengine b/qtwebengine index 721ca2f0..0bcff4da 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 721ca2f0ed86002865518f74175ce88a04ea033b +Subproject commit 0bcff4da6a22acdc522e7c27607ad4d2a2ffe843 diff --git a/qtwebglplugin b/qtwebglplugin index c82c3103..b5316079 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit c82c3103f3e875d7d5f79dc3c4b273e9644e4ded +Subproject commit b5316079a8580f15c882c2972ed03fceb0378d51 diff --git a/qtwebsockets b/qtwebsockets index 7e853bcd..57e1ebec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7e853bcd05cbc955b71843586ee20158e6ed3091 +Subproject commit 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b diff --git a/qtwebview b/qtwebview index ff13c5b8..177956a5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ff13c5b8576c3c8b6b376291466daab5e597509a +Subproject commit 177956a5e25eae1efd9a31f8ababff473a7d592f diff --git a/qtwinextras b/qtwinextras index ae198769..3ad89fd9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ae1987696185f34482105ef3e542fc6c121d3614 +Subproject commit 3ad89fd9022e2010eeca7dfa2548eb149dc34fe6 diff --git a/qtx11extras b/qtx11extras index 071b8def..24f802dc 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 071b8def29e9b5af76f2f60a3f4569c746e5a39c +Subproject commit 24f802dc02176d8f50d77be58b872ad525ed1a52 diff --git a/qtxmlpatterns b/qtxmlpatterns index 40a50c0c..7a3fd844 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 40a50c0c585eaa838261742e33a547e09d4040d6 +Subproject commit 7a3fd8444e71b11c1f5944983d17e9bd4f7bc6be From 5a4b7a56b88adfc0d720cb37eaeacd54cbc95cba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Nov 2017 21:52:43 +0200 Subject: [PATCH 11/18] Update submodules on '5.10.0' in qt5 Change-Id: Ia7b0ea9299a26d9e10a859e8d977d24f9cc22dde 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 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index a2c7dbba..7bd57d22 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a2c7dbba0ad60cf17997f77372004339d4580a52 +Subproject commit 7bd57d2218794fdd7bcaa4f2c8107ef60740ff75 diff --git a/qtactiveqt b/qtactiveqt index 99611af4..df8f89eb 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 99611af4845e4c7893a03c0b13f2fd2275f318e3 +Subproject commit df8f89eb2003b81fbbadea3225f6d1090205ee46 diff --git a/qtandroidextras b/qtandroidextras index 64f26453..59b18927 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 64f2645337429e2af9ac345872c67b5354e3be10 +Subproject commit 59b18927cfc60dc2c99d4f318be2e572a4699b62 diff --git a/qtbase b/qtbase index bb3872d6..42005951 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bb3872d60975724a50ff910b6dd108d1944db597 +Subproject commit 42005951defded6cd1a9a60582b29f58c78fea9e diff --git a/qtcanvas3d b/qtcanvas3d index ff91031e..8137223f 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ff91031e167f51d7f75adc71ded91e9291fbfb77 +Subproject commit 8137223f6c489c2d1bb2317474c99c77245bd7ec diff --git a/qtcharts b/qtcharts index afd07787..6a960627 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit afd077876bd5203944a3ed73f4f1fb998f795ee2 +Subproject commit 6a9606270e6611c818bdab382a29051d4cd3b459 diff --git a/qtconnectivity b/qtconnectivity index 7eb9db93..bb9b8af0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7eb9db93aea072dae984d127caa532090abbdb07 +Subproject commit bb9b8af08b1602c7c867969b236393b3ff3f7f18 diff --git a/qtdatavis3d b/qtdatavis3d index 966bdad4..d2abb200 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 966bdad4d56ebb06e94aa8f33cb70f15ec288976 +Subproject commit d2abb20082322167311cfe0c84afa822754b74ef diff --git a/qtdeclarative b/qtdeclarative index ef10b82a..380e2fd1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ef10b82a28114718591bcdabec031ce05caacf37 +Subproject commit 380e2fd1cd37c4d6e7ceb95998c62d7bcbec57ed diff --git a/qtdoc b/qtdoc index 664965b6..5475b796 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 664965b6def2e1161551b8db2fcc1d2bf1b28c10 +Subproject commit 5475b796348a6f9d908357c6056a80f9d19cba06 diff --git a/qtgamepad b/qtgamepad index 2c9609cb..b505116e 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2c9609cb0a5ba41fbffbca3dba80b65a15509937 +Subproject commit b505116ee456d7084d8f570e062b3031b77d79df diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7576f0e2..5ca1c00b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7576f0e27e9d34f084caeb83281f1a4a6e0965dd +Subproject commit 5ca1c00b33b0e125ab60413aa0fb3c7b0f89d8f2 diff --git a/qtimageformats b/qtimageformats index 4d4de2e0..caa90acd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4d4de2e070178510afb7f160c2594ae7af34f782 +Subproject commit caa90acd43684dc382f1e4f01c8787e18653ef43 diff --git a/qtlocation b/qtlocation index 485a631f..919bbf50 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 485a631f2ae06e3328176049c51053e3047448bb +Subproject commit 919bbf503d69fd6be87f22ea58c15872d08f8580 diff --git a/qtmacextras b/qtmacextras index a31b643d..6a6b290c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a31b643d92174465461194acc2919ec177c3995a +Subproject commit 6a6b290c306e2c9d26f9208125de3d0698d653b7 diff --git a/qtmultimedia b/qtmultimedia index 3f0adfb1..eb952c90 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3f0adfb1fba203580999496d7e4ca53e7aeb7621 +Subproject commit eb952c900eef7d9dd9d1e2b24abc35aadb0f8a60 diff --git a/qtpurchasing b/qtpurchasing index 4358df9b..a37139a9 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4358df9bef910c63400cf0dcfc58aa404fb8f1ad +Subproject commit a37139a94dc062f6959310aaacc130fbafcfcaee diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fe450538..1265fef3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fe4505386f7136f9475099901b4770bfb566818d +Subproject commit 1265fef3b290665272d3aacd0ba5213c43bad89d diff --git a/qtscxml b/qtscxml index 4f94bae7..bbf3be46 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4f94bae73ccabfc714d248c6371f1883aacc1aa8 +Subproject commit bbf3be4679571edef60425c3fd12df9d3035001c diff --git a/qtsensors b/qtsensors index fc60f538..7ae7dc32 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fc60f53817d3182c545cef15e3ab94a85ef01379 +Subproject commit 7ae7dc325648a007a72e74f2bd7784a90b4714af diff --git a/qtserialbus b/qtserialbus index fbfc5d78..f25ddea7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fbfc5d7877fa22365484c6e951e60f37b9aaa2a5 +Subproject commit f25ddea7b12beff8d4de863fec18ce698d726ffa diff --git a/qtserialport b/qtserialport index b0948ec0..c7d99464 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0948ec06644dd88ba8ec660c1fb39c49a6d0e70 +Subproject commit c7d99464c65a5bde663a8ec4daf3d343d8e9b14b diff --git a/qttools b/qttools index 6491ca02..790d6c45 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6491ca02253f3245333611cabf248ef01bd31883 +Subproject commit 790d6c45153b84336b68cfa1344d5734425eb2c5 diff --git a/qttranslations b/qttranslations index 0d153fe5..b073cec7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0d153fe51ba4dc4ace8e8308b8e9ea478c75ffa0 +Subproject commit b073cec77661b2a42bf41d54891a533a66e7cc8a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5fe00843..8546475d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5fe00843cf15c60870cd22b8cd039b6f249cf396 +Subproject commit 8546475dd5d6076a98b0700f1d70211c1395fc63 diff --git a/qtwayland b/qtwayland index b6ac922f..1a457a9d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b6ac922f1af207725e91fe5de0ea3ad0919d8026 +Subproject commit 1a457a9dc9c61a6c995dbe06d72267cb0412b3bc diff --git a/qtwebchannel b/qtwebchannel index 07cbe313..acb01cb2 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 07cbe31332c518993ad8fc5c519abf64a83d4ab9 +Subproject commit acb01cb27b6c4aead84435ec7115fecd2a8db336 diff --git a/qtwebengine b/qtwebengine index 0bcff4da..5617373d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0bcff4da6a22acdc522e7c27607ad4d2a2ffe843 +Subproject commit 5617373d9b5ded9d4c724b15132d6989ed9e05f9 diff --git a/qtwebsockets b/qtwebsockets index 57e1ebec..0e4b4338 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b +Subproject commit 0e4b43383dd826b5927f6276033f52ede1fa7936 diff --git a/qtwebview b/qtwebview index 177956a5..54ea2324 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 177956a5e25eae1efd9a31f8ababff473a7d592f +Subproject commit 54ea23243ca84ec5f086abf6c2278a025758b6ce diff --git a/qtwinextras b/qtwinextras index 3ad89fd9..0b7ead51 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3ad89fd9022e2010eeca7dfa2548eb149dc34fe6 +Subproject commit 0b7ead51c7a4b9fffeb6af217676ebdc52e120c6 diff --git a/qtx11extras b/qtx11extras index 24f802dc..33e3fcc1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 24f802dc02176d8f50d77be58b872ad525ed1a52 +Subproject commit 33e3fcc1fb1eb614f8b452296f2d4c4353c413c6 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7a3fd844..8b831bdb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7a3fd8444e71b11c1f5944983d17e9bd4f7bc6be +Subproject commit 8b831bdb513b4f6b7567c171d09875b14214c5c4 From 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Nov 2017 15:15:46 +0100 Subject: [PATCH 12/18] Add NSS to RHEL 7.4 Needed by QtWebEngine Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index f7c6b694..28d0b801 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -87,6 +87,8 @@ sudo yum -y install gperf sudo yum -y install alsa-lib-devel sudo yum -y install pulseaudio-libs-devel sudo yum -y install libXtst-devel +sudo yum -y install nspr-devel +sudo yum -y install nss-devel # For Android builds sudo yum -y install java-1.8.0-openjdk-devel From beb73056c30445c5236c7bbb12248bfa0939cb4a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 24 Nov 2017 16:35:48 +0200 Subject: [PATCH 13/18] Install command line tools for osx 10.11 and macOS 10.12 Command line tools is needed by homebrew when installing p7zip Task-number: QTBUG-64729 Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b Reviewed-by: Liang Qi Reviewed-by: Jani Heikkinen --- .../common/install-commandlinetools.sh | 88 +++++++++++++++++++ .../021-install-commandlinetools.sh | 43 +++++++++ .../021-install-commandlinetools.sh | 43 +++++++++ 3 files changed, 174 insertions(+) create mode 100644 coin/provisioning/common/install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh new file mode 100644 index 00000000..fbebdba8 --- /dev/null +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/try_catch.sh" +set -ex + +# Command line tools is need by homebrew + +function InstallCommandLineTools { + + ExceptionMount=101 + ExceptionInstall=102 + ExceptionUnmount=103 + + url=$1 + url_alt=$2 + expectedSha1=$3 + packageName=$4 + version=$5 + + try + ( + DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName + echo "Mounting $packageName" + hdiutil attach /tmp/$packageName || throw $ExceptionMount + cd "/Volumes/Command Line Developer Tools" + echo "Installing" + sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall + cd / + # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted + sleep 3 + echo "Unmounting" + umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount + echo "Removing $packageName" + rm /tmp/$packageName + + echo "Command Line Tools = $version" >> ~/versions.txt + ) + catch || { + case $ex_code in + $ExceptionMount) + echo "Failed to mount" + exit 1; + ;; + $ExceptionInstall) + echo "Failed to mount" + exit 1; + ;; + $ExceptionUnmount) + echo "Failed to mount" + exit 1; + + esac + } + +} diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..b460cc02 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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/install-commandlinetools.sh" + +version="8.3.2" +packageName="CommandLineToolsforXcode$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" + +InstallCommandLineTools $url $url $sha1 $packageName $version + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..9145c12a --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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/install-commandlinetools.sh" + +version="8.2" +packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25" + +InstallCommandLineTools $url $url $sha1 $packageName $version + From 8baf4c994e367af8c00be6ab50ebd9eeadb2912b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 25 Nov 2017 16:43:39 +0100 Subject: [PATCH 14/18] Update submodules on '5.10.0' in qt5 Change-Id: I305d3f429ad7cc3650c26640b4da6077afc796af Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 42005951..07fcfb79 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42005951defded6cd1a9a60582b29f58c78fea9e +Subproject commit 07fcfb793d52b94f0f108cbfc025050b2353f9a1 diff --git a/qtdeclarative b/qtdeclarative index 380e2fd1..19f54245 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 380e2fd1cd37c4d6e7ceb95998c62d7bcbec57ed +Subproject commit 19f54245d35ee5eb66b991274908f780b103e3b4 diff --git a/qtquickcontrols b/qtquickcontrols index 87859b2a..a7495251 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 87859b2aecbecdab8fd001e3a52887980b0735e8 +Subproject commit a749525164b771452599e67e277d2ea6b3866479 diff --git a/qtrepotools b/qtrepotools index bcb02535..14431b40 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bcb02535bcfff8fb867b632705195435c2c5cb16 +Subproject commit 14431b4087125e247c1e2322e0cd043b78974ce2 diff --git a/qttranslations b/qttranslations index b073cec7..f4b0f168 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b073cec77661b2a42bf41d54891a533a66e7cc8a +Subproject commit f4b0f1684a8e668ede23fafbff02c3910d775043 diff --git a/qtwebengine b/qtwebengine index 5617373d..65c1f255 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5617373d9b5ded9d4c724b15132d6989ed9e05f9 +Subproject commit 65c1f255e6282bc7dda942f72de7f9d67824f2a6 From ed0f44097415cb81b0956f63afe84005080dc514 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Nov 2017 11:19:40 +0200 Subject: [PATCH 15/18] Update submodules on '5.10.0' in qt5 Change-Id: I97468b13eeba051ff2c59162dfb3855a2c8e838e Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 07fcfb79..984ad612 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 07fcfb793d52b94f0f108cbfc025050b2353f9a1 +Subproject commit 984ad6124992c9831f57c2776aa2ed0a760149e6 diff --git a/qtdeclarative b/qtdeclarative index 19f54245..cc46992f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19f54245d35ee5eb66b991274908f780b103e3b4 +Subproject commit cc46992fbb94f1775ac22aa23b42d76f810a5913 diff --git a/qtmultimedia b/qtmultimedia index eb952c90..3598915a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit eb952c900eef7d9dd9d1e2b24abc35aadb0f8a60 +Subproject commit 3598915a360c596da48c9e7b00ba8469cba5249a diff --git a/qtqa b/qtqa index baa79eab..1110bd07 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit baa79eab7734031569fef9a4c1bf802fc2137f2f +Subproject commit 1110bd076dba536dc6e6304fe8d6ee80f2d5718f diff --git a/qttools b/qttools index 790d6c45..3ce89dc3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 790d6c45153b84336b68cfa1344d5734425eb2c5 +Subproject commit 3ce89dc37d3c73033c18dcec9e4710afd747ce01 diff --git a/qtwebengine b/qtwebengine index 65c1f255..efa6d3f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 65c1f255e6282bc7dda942f72de7f9d67824f2a6 +Subproject commit efa6d3f0d3a01753dd40823ce119e7d4f9765c8e From f1db104ff9b16692020349564f5e8bd20e16595c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 27 Nov 2017 15:12:34 +0200 Subject: [PATCH 16/18] Provisioning: Install bluez-libs-devel bluez-libs-devel is needed to enable Qt Bluetooth Task-number: QTBUG-64782 Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0 (cherry picked from commit 9b722f9df91c4f7a6ca24d3ad18e68e3a76b137b) Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index 28d0b801..b6e8a5da 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -98,3 +98,6 @@ sudo yum -y install perl-Digest-SHA # INTEGRITY requirements sudo yum -y install glibc.i686 + +# Enable Qt Bluetooth +sudo yum -y install bluez-libs-devel From 6e54086be53420af0be2b417c36a4ce284f3f979 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Nov 2017 18:23:17 +0200 Subject: [PATCH 17/18] Update submodules on '5.10.0' in qt5 Change-Id: I398ac279c6a6065e12c953ae129cfcc98e37388a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 984ad612..50117d73 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 984ad6124992c9831f57c2776aa2ed0a760149e6 +Subproject commit 50117d738af526cbfbd5afa50b9a501acb0fb9ce diff --git a/qtdeclarative b/qtdeclarative index cc46992f..dac71f3d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cc46992fbb94f1775ac22aa23b42d76f810a5913 +Subproject commit dac71f3d6f6bc4f159f6107c792bc70cfe7c308e From adcdf7b49f52e745009ff7e37e07c2d831ad82dc Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 1 Dec 2017 09:34:56 +0200 Subject: [PATCH 18/18] Provisioning: Install Devtoolset-4 to Rhel 7.4 Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used instead of Devtoolset-6. Task-number: QTBUG-64820 Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825 Reviewed-by: Konstantin Tokarev --- .../{003-install-devtoolset6.sh => 003-install-devtoolset.sh} | 4 ++-- .../010-openssl_for_android_linux.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{003-install-devtoolset6.sh => 003-install-devtoolset.sh} (94%) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index ef65b881..439e2db5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -34,7 +34,7 @@ ############################################################################# sudo yum-config-manager --enable rhel-server-rhscl7-rpms -sudo yum -y install devtoolset-6 +sudo yum -y install devtoolset-4 -echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index 05b73729..b69295fc 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -33,5 +33,5 @@ ## ############################################################################# -source /opt/rh/devtoolset-6/enable +source /opt/rh/devtoolset-4/enable source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"