From 4cee1be86b1edef9213f9b589f3ddc485500faa4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Sep 2017 12:28:58 +0200 Subject: [PATCH 001/101] Adjust submodule branches Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753 --- .gitmodules | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4988927..e3d527c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.2 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.2 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.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.2 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,101 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.9.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 + branch = 5.9.2 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 + branch = 5.9.2 status = preview [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.9.2 status = preview From 6d20c60b750fa49a8f0ddc1e89c1f4cfe8e118b3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Sep 2017 20:27:53 +0300 Subject: [PATCH 002/101] Update submodules on '5.9.2' in qt5 Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/qt3d b/qt3d index 75697d59..72e80520 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 75697d59cb6e3783bd1444816cfc90b4bc8b9aba +Subproject commit 72e80520d36802672eca1e93bc6c6019e6f5ffc3 diff --git a/qtactiveqt b/qtactiveqt index e3753542..5998e1ea 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e3753542d00aaed7b9890064e7d7923d3b3bc9e1 +Subproject commit 5998e1ea6975eb966cc2112af4220e2bb1f7b740 diff --git a/qtandroidextras b/qtandroidextras index 9f70e4b1..e0933517 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9f70e4b12b7eaac3f6f727f6d3189779794342f4 +Subproject commit e0933517b072b9f8a9fc74eb702e2359620b9458 diff --git a/qtbase b/qtbase index 81a19050..bd72ead4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 81a19050d8127e7b05006f793a8797c8f5248191 +Subproject commit bd72ead4d12ff56c2856294d84f3e5d7e188b817 diff --git a/qtcanvas3d b/qtcanvas3d index f19f1de5..a1aee8ec 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f19f1de5124465f001181b494d788b6a6084157f +Subproject commit a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b diff --git a/qtcharts b/qtcharts index f2aaf5f3..e3af14e9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f2aaf5f3b528f954c4ff7b3e6a79acae157cec5e +Subproject commit e3af14e9169207e0e73f7e50191106895c29ddc4 diff --git a/qtdatavis3d b/qtdatavis3d index 82f9c8a5..8329a8fb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 82f9c8a5a246845c746f0a8b3497dceba19ff05b +Subproject commit 8329a8fb287094012989b965604ff9c9426f022a diff --git a/qtdeclarative b/qtdeclarative index bfab1db3..4f956e91 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bfab1db38167d31f0487f96d2d4b02d9243bc777 +Subproject commit 4f956e914a2cfbb3cb440a3b67498f1b3cda8094 diff --git a/qtdoc b/qtdoc index 3d3899a3..1af2b8d5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3d3899a36e261c99913830e879d15ac8996de60f +Subproject commit 1af2b8d57a596fc47b37a8975d279fabf1ff1ef7 diff --git a/qtgamepad b/qtgamepad index 1fc40dee..167566d2 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 1fc40deed6993265c436783cc367285bf9a2266a +Subproject commit 167566d228792c0f763b84a39ff5dc52fda046dd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5affaad9..8c4488a7 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5affaad97a8c2116fb53c6709ad09952a8989c89 +Subproject commit 8c4488a77d5fe4fed26b22dbc91b746a77cd0562 diff --git a/qtlocation b/qtlocation index eb381288..d919f473 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eb3812884d63ffc014f4ac76214e65a6497ae827 +Subproject commit d919f47308b209c798e50d8ca1b9abd48ba94718 diff --git a/qtmacextras b/qtmacextras index ceb065d4..798885a4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ceb065d40dc9032dc27189393de9561b575b29f4 +Subproject commit 798885a41311801ecef9a622e047a55266a55953 diff --git a/qtmultimedia b/qtmultimedia index d41bce99..1e2702e8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d41bce99a531a7968f8c5bc8ec88965372341bd9 +Subproject commit 1e2702e86dbd2b3de69c58438bcfcf6276124547 diff --git a/qtnetworkauth b/qtnetworkauth index 3d93f643..47b80eca 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3d93f6436596e349e43c3798b675af66db71df8a +Subproject commit 47b80ecae6fe0b9a2c74f0b0feb243145695995e diff --git a/qtqa b/qtqa index cdfda1b4..416fc118 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 +Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d3aef722..391cba9a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d3aef722da533c3b100ba653498c79986a44c9f9 +Subproject commit 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 diff --git a/qtsensors b/qtsensors index 41897abf..c273f2e5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 41897abf76636a17d76fad7e1528d170b619e51a +Subproject commit c273f2e5c82a3ef8e55e360988b8cf31362e2ba9 diff --git a/qtserialbus b/qtserialbus index 9a720b4f..ce5a3ced 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9a720b4fcc1d743db1b04f7696a30e7850c7707b +Subproject commit ce5a3ced5eeefe05675736d3279d4d45bbb6df90 diff --git a/qtserialport b/qtserialport index 2a828454..f9f02db5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2a8284543018943ab581202cf934c751a22db6c7 +Subproject commit f9f02db5fc6ca4da97be63a67c469af49f97ab3b diff --git a/qttools b/qttools index fce89784..ad184840 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fce8978426b9dbad8ea60412ba34d855a9c90a24 +Subproject commit ad18484063a41328d0e72c75cda151128977e0d8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f3683d17..87218c4e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f3683d17c364c4f84f1591dd60121041628f9a5c +Subproject commit 87218c4e68c4ebde8f5765f0dfe9a70a359ae05f diff --git a/qtwayland b/qtwayland index 3cb09edd..d483ed29 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 +Subproject commit d483ed2927cb8d4685d5d3c7ea1c71246381910b diff --git a/qtwebchannel b/qtwebchannel index d84318e9..61a63866 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d84318e98aa3cbac11b4f95b3581e95aab96a34a +Subproject commit 61a638663c9061d7211849d3a9316661733a5ad9 diff --git a/qtwebengine b/qtwebengine index a12a8110..fb639faa 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a12a811026baa86d7d8e4728d893114c76feec20 +Subproject commit fb639faa8898ce6b8fbcc8870ec316114a79f975 diff --git a/qtwebsockets b/qtwebsockets index 30de96f6..0f32f4ef 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 30de96f6d7ef01c1c5887405a4ad49cf44a5ab79 +Subproject commit 0f32f4efc5a9a8b33369013c2ba6c27c78498cf2 diff --git a/qtwinextras b/qtwinextras index f1e26328..d238f976 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f1e26328e8f1abe9d87e369b0fe57954dfe68a87 +Subproject commit d238f97600efbe93e6faed37058fd1211821868f diff --git a/qtxmlpatterns b/qtxmlpatterns index 7b67fba8..8d7e1e0e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7b67fba8bb21b06d423b68911b227fd1db22b1be +Subproject commit 8d7e1e0ec06724a4d332c050e9260530c708e773 From 3fe0d212a537a0a324e5313c03b2b286cb5fb08a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Sep 2017 23:33:02 +0300 Subject: [PATCH 003/101] Update submodules on '5.9' in qt5 Change-Id: I9481fbac3934de35e731eaf4ca9e3d907b19a303 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 72e80520..78175fa8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 72e80520d36802672eca1e93bc6c6019e6f5ffc3 +Subproject commit 78175fa89bc95b88466ecf1ac8b42244762e62e2 diff --git a/qtbase b/qtbase index bd72ead4..e96c56c7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd72ead4d12ff56c2856294d84f3e5d7e188b817 +Subproject commit e96c56c740768143878d9e0f0acc5aa01dd52bd4 diff --git a/qtdeclarative b/qtdeclarative index fa52bb66..f068f5dd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fa52bb665d6beb77a951c14c8edcba3541850afc +Subproject commit f068f5ddc9cd56dd3dd4fdc2abdbcd1ae8a30f19 diff --git a/qtlocation b/qtlocation index 6ba14c6d..68eed318 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6ba14c6d2a6b7eb325cd975393306c4fe6809acd +Subproject commit 68eed318e85438a04c06c2b3ac7171c8a224161f diff --git a/qtmultimedia b/qtmultimedia index 020e7b4c..51b361fa 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 020e7b4c198f5e74dd83da7fa8e64a02b14af2f9 +Subproject commit 51b361faa703e157feaa0cfd79e7d473cb704811 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 391cba9a..576a9777 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 +Subproject commit 576a97774e04858adee9f2080e485a715e985820 diff --git a/qtwayland b/qtwayland index d4f67d84..dbe33b17 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d4f67d8414b8ddac8fb4bd3d70ae65e20a818645 +Subproject commit dbe33b1745d0fe5c553abaf841e045fa059ada1b diff --git a/qtwebengine b/qtwebengine index 7f56ce27..d0441402 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7f56ce273a90aaa2273d9438f16678716275d803 +Subproject commit d044140246734b8851689f55197c03cfd29dec99 From 9f69da657567945b1b610bb4312b2ab24b30dafb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Sep 2017 05:01:53 +0300 Subject: [PATCH 004/101] Update submodules on '5.9' in qt5 Change-Id: I18b9043156b97206500c2aa7375cf80b55623044 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwebview | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e96c56c7..8ea5c401 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e96c56c740768143878d9e0f0acc5aa01dd52bd4 +Subproject commit 8ea5c401094b78c40c21811c9514462797218ae2 diff --git a/qtquickcontrols b/qtquickcontrols index 33c5f4c3..5bd8704b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 33c5f4c3ad73fa2e75fe7ba69f5359e69adb212f +Subproject commit 5bd8704b701b87df6470eaf61baa0440a9e14dae diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 576a9777..c5050daa 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 576a97774e04858adee9f2080e485a715e985820 +Subproject commit c5050daa16860b800dbc9782e94e0bacffd6bbf2 diff --git a/qtwebview b/qtwebview index 01ff5c0d..3bcd4c35 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 01ff5c0d5f937577cfd2391a43af4180f2a484bb +Subproject commit 3bcd4c3506c9352874f1403aba22e36108a867a2 From 8a93a8fe6a45e0977d708d5c4e397e8beb14040c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 15 Sep 2017 15:59:15 +0300 Subject: [PATCH 005/101] Provisioning: cleanup path from cmake_linux.sh Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index c23cf9b2..701d9081 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -37,8 +37,8 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +# shellcheck source=InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" From cda49ad060055a48d0e15bb5a4eb269c9f5e4491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 27 Sep 2017 12:41:42 +0300 Subject: [PATCH 006/101] Remove duplicate MinGW 5.3 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../qtci-windows-10-x86_64/05-mingw53.ps1 | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 deleted file mode 100644 index d4439856..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script installs MinGW 5.3 - - -$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z" - -Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip -Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a" -Extract-7Zip $zip C:\ -Rename-Item -path C:\mingw32 -newName C:\MinGW530 - -[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine") -echo "MinGW = 5.3.0" >> ~/versions.txt -del $zip From 2a650c49eedbb6d2647f38bba8efdb2379f3a692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Sep 2017 08:24:45 +0300 Subject: [PATCH 007/101] Provisioning: Fix usage of DownloadURL to throw errors In case DownloadURL failed it's shasum check, it printed an error and threw an exit 1. This exit 1 was never handled in the calling scripts and went ignored. It was also not passed forward as it was inside a try-catch statement. Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4 Reviewed-by: Heikki Halmet --- .../common/InstallAppFromCompressedFileFromURL.sh | 6 +++++- .../provisioning/common/InstallFromCompressedFileFromURL.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh index bee16dd2..2af2db10 100644 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -42,6 +42,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh" # shellcheck source=DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" +ExceptionDownload=99 ExceptionCreateTmpFile=100 ExceptionCreateTmpDirectory=101 ExceptionUncompress=102 @@ -80,7 +81,7 @@ function InstallAppFromCompressedFileFromURL { else targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory fi - DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" + (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload echo "Uncompress $targetFile" case $extension in "tar.gz") @@ -103,6 +104,9 @@ function InstallAppFromCompressedFileFromURL { catch || { case $ex_code in + $ExceptionDownload) + exit 1; + ;; $ExceptionCreateTmpFile) echo "Failed to create temporary file" exit 1; diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh index e3716597..df84431a 100644 --- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -38,6 +38,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh" # shellcheck source=DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" +ExceptionDownload=99 ExceptionCreateTmpFile=100 ExceptionCreateTmpDirectory=101 ExceptionUncompress=102 @@ -66,7 +67,7 @@ function InstallFromCompressedFileFromURL { echo "Creating temporary file and directory" targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory - DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" + (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload echo "Uncompress $targetFile" case $extension in "tar.gz") @@ -90,6 +91,9 @@ function InstallFromCompressedFileFromURL { catch || { case $ex_code in + $ExceptionDownload) + exit 1; + ;; $ExceptionCreateTmpFile) echo "Failed to create temporary file" exit 1; From b37ff601f527706c7df5c1ba831a8b17034492ba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 2 Oct 2017 13:44:22 +0300 Subject: [PATCH 008/101] Update submodules on '5.9.2' in qt5 Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c Reviewed-by: Antti Kokko --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 72e80520..143b7212 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 72e80520d36802672eca1e93bc6c6019e6f5ffc3 +Subproject commit 143b721249af92fc27f48fb01914195516f7a087 diff --git a/qtbase b/qtbase index bd72ead4..ec16ba39 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd72ead4d12ff56c2856294d84f3e5d7e188b817 +Subproject commit ec16ba393baf504d4b192cc349775c62d3c96aa0 diff --git a/qtconnectivity b/qtconnectivity index ae21b257..6b3bdb84 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ae21b2574c0000aac6e3b10f7e11ebd1da567ffd +Subproject commit 6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f diff --git a/qtdeclarative b/qtdeclarative index 4f956e91..32218c32 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4f956e914a2cfbb3cb440a3b67498f1b3cda8094 +Subproject commit 32218c3243fb4f0da83293c5bd6a663d8e3660ee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8c4488a7..1f6658cb 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8c4488a77d5fe4fed26b22dbc91b746a77cd0562 +Subproject commit 1f6658cbaa5ffecbf9ba845ea81683dd2215cd34 diff --git a/qtimageformats b/qtimageformats index 0d42a2e4..dc6dc3b0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0d42a2e44491980e6803d6aee6c7d2e83acadec4 +Subproject commit dc6dc3b088d1828ee6d31f92528e0c87272ad4ed diff --git a/qtpurchasing b/qtpurchasing index 9c87f11f..10156a01 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9c87f11f6d7ae46150b540cf2eee14e8217bb85d +Subproject commit 10156a012215ed32bdaa8ebedafdb180ee726b4c diff --git a/qtquickcontrols b/qtquickcontrols index 33c5f4c3..8476f8ff 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 33c5f4c3ad73fa2e75fe7ba69f5359e69adb212f +Subproject commit 8476f8fff7dc5b6f140074d280828cc0f9590088 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 391cba9a..871d8e8e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 +Subproject commit 871d8e8e2faca0be870930d83f755a2ad484d30b diff --git a/qtscxml b/qtscxml index 16956a96..3caae998 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 16956a965817311fbc9d80ffbee74eb5d9ea00e0 +Subproject commit 3caae998c8c1770cd96cadba24d89a60005c5fe7 diff --git a/qtserialport b/qtserialport index f9f02db5..cb9ade8b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f9f02db5fc6ca4da97be63a67c469af49f97ab3b +Subproject commit cb9ade8beabd3cdcd469a45fa82a27fcc960532f diff --git a/qttools b/qttools index ad184840..90a70103 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ad18484063a41328d0e72c75cda151128977e0d8 +Subproject commit 90a701032ec5c8898e33b4fb4df0480634caaf8d diff --git a/qtwebsockets b/qtwebsockets index 0f32f4ef..492981b9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0f32f4efc5a9a8b33369013c2ba6c27c78498cf2 +Subproject commit 492981b93295f575ad77b6767dc5b8851287aa2e diff --git a/qtwebview b/qtwebview index 01ff5c0d..ec640efd 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 01ff5c0d5f937577cfd2391a43af4180f2a484bb +Subproject commit ec640efd1d82cdc88157159cbaa048815696ee25 diff --git a/qtx11extras b/qtx11extras index 90d5d612..160435b0 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 90d5d612bc7b3450a7a9d5c37c2de1d150f95182 +Subproject commit 160435b0eb076c31a021004eeede143fc265bce4 From 26ba2cdc5dc7e268593b78dd5ebb2bf1eefce043 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Oct 2017 17:03:08 +0300 Subject: [PATCH 009/101] Update submodules on '5.9.2' in qt5 Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42 Reviewed-by: Jani Heikkinen --- qtqa | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtqa b/qtqa index 416fc118..8faa8086 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 +Subproject commit 8faa8086e77059d5449f946e0bd0f78e61213a2a diff --git a/qtwebengine b/qtwebengine index fb639faa..c11c2c89 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fb639faa8898ce6b8fbcc8870ec316114a79f975 +Subproject commit c11c2c8981e647c1eb2c6753ce77d436b92fff87 From 388747cb1a10a206709dc36cafb2c18485a205b8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Oct 2017 14:40:39 +0300 Subject: [PATCH 010/101] Update submodules on '5.9' in qt5 Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1 Reviewed-by: Frederik Gladhorn --- 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 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 78175fa8..3532ac70 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 78175fa89bc95b88466ecf1ac8b42244762e62e2 +Subproject commit 3532ac70ce69de608d14c24d18b42a6781edf4be diff --git a/qtactiveqt b/qtactiveqt index e3753542..778f0874 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e3753542d00aaed7b9890064e7d7923d3b3bc9e1 +Subproject commit 778f08748dc212d0a3b920a19c410117e277b47d diff --git a/qtandroidextras b/qtandroidextras index 9f70e4b1..92e56ec2 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9f70e4b12b7eaac3f6f727f6d3189779794342f4 +Subproject commit 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 diff --git a/qtbase b/qtbase index 8ea5c401..9909ff10 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ea5c401094b78c40c21811c9514462797218ae2 +Subproject commit 9909ff108e942ea0cd233d2cd3715f830c2ad89b diff --git a/qtcanvas3d b/qtcanvas3d index f19f1de5..2dd53f17 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f19f1de5124465f001181b494d788b6a6084157f +Subproject commit 2dd53f17ff626cd068be4cb04d793c53c71ed8f0 diff --git a/qtcharts b/qtcharts index f2aaf5f3..fb4bd5cf 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f2aaf5f3b528f954c4ff7b3e6a79acae157cec5e +Subproject commit fb4bd5cfec5ca9257b3d756fce0f379085afa0f2 diff --git a/qtconnectivity b/qtconnectivity index ae21b257..cbf95d0e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ae21b2574c0000aac6e3b10f7e11ebd1da567ffd +Subproject commit cbf95d0ee78ad83cd26887670824e62678e4673e diff --git a/qtdatavis3d b/qtdatavis3d index 82f9c8a5..32fc1c7d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 82f9c8a5a246845c746f0a8b3497dceba19ff05b +Subproject commit 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 diff --git a/qtdeclarative b/qtdeclarative index f068f5dd..0af2998c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f068f5ddc9cd56dd3dd4fdc2abdbcd1ae8a30f19 +Subproject commit 0af2998cc99e90e3df34f794801340d8a769c735 diff --git a/qtdoc b/qtdoc index 3d3899a3..79d6e2a2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3d3899a36e261c99913830e879d15ac8996de60f +Subproject commit 79d6e2a28b9fe80b52a5d0e831a05dfbc186d9fe diff --git a/qtgamepad b/qtgamepad index 1fc40dee..cc3f8279 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 1fc40deed6993265c436783cc367285bf9a2266a +Subproject commit cc3f8279abe1809772fdbe4780495244b508f510 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8c4488a7..7ab12ad1 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8c4488a77d5fe4fed26b22dbc91b746a77cd0562 +Subproject commit 7ab12ad1483607cf3f007c591e998f40f2ec9513 diff --git a/qtimageformats b/qtimageformats index 0d42a2e4..8f142f0a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0d42a2e44491980e6803d6aee6c7d2e83acadec4 +Subproject commit 8f142f0aab7f92f1848fa2cf15dd6437b5af95a3 diff --git a/qtlocation b/qtlocation index 68eed318..0e1ee18a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 68eed318e85438a04c06c2b3ac7171c8a224161f +Subproject commit 0e1ee18acd06c16d4d17427932c37fd2de9ce1fa diff --git a/qtmacextras b/qtmacextras index ceb065d4..25127376 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ceb065d40dc9032dc27189393de9561b575b29f4 +Subproject commit 25127376ff49055eec43039c9bf6795f58de1e94 diff --git a/qtmultimedia b/qtmultimedia index 51b361fa..9760c1ba 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 51b361faa703e157feaa0cfd79e7d473cb704811 +Subproject commit 9760c1baf8961c6e93a0a565d9611221ffbe1704 diff --git a/qtnetworkauth b/qtnetworkauth index 47b80eca..60bb0cda 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 47b80ecae6fe0b9a2c74f0b0feb243145695995e +Subproject commit 60bb0cda6c27abaf39225e00aa38a858f91c1b86 diff --git a/qtpurchasing b/qtpurchasing index 9c87f11f..34ab68ce 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9c87f11f6d7ae46150b540cf2eee14e8217bb85d +Subproject commit 34ab68cee42e0ad3033e5a1831b0ca20b5761461 diff --git a/qtqa b/qtqa index 416fc118..6a950622 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 +Subproject commit 6a9506220bdb9c529463aad6eb28b79f1a8bfe99 diff --git a/qtquickcontrols b/qtquickcontrols index 5bd8704b..2430cc13 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5bd8704b701b87df6470eaf61baa0440a9e14dae +Subproject commit 2430cc139437dac021b6028d8ba8799c50bd0e6c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c5050daa..378da672 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c5050daa16860b800dbc9782e94e0bacffd6bbf2 +Subproject commit 378da67208fe3d7f48ff3e494f5fe5984af407aa diff --git a/qtremoteobjects b/qtremoteobjects index 6e0341bc..89a8f31e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6e0341bc878ff82d3c1039dcce09f92269546189 +Subproject commit 89a8f31e82c34b3935a73213ecc8c977a9edc3dd diff --git a/qtscript b/qtscript index 08b74f4f..b98a47f7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 08b74f4f30c304b80249a593a572808bc1892f66 +Subproject commit b98a47f7a243d75c97c2a6b04fbb9dd587de3430 diff --git a/qtscxml b/qtscxml index 16956a96..113b502b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 16956a965817311fbc9d80ffbee74eb5d9ea00e0 +Subproject commit 113b502b194d6d7573b9f86f400bdf481e98cf74 diff --git a/qtsensors b/qtsensors index 41897abf..a8f64f49 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 41897abf76636a17d76fad7e1528d170b619e51a +Subproject commit a8f64f49ddffd44ca748bb25758d6aa3e71d48ef diff --git a/qtserialbus b/qtserialbus index 9a720b4f..b4cda0cf 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9a720b4fcc1d743db1b04f7696a30e7850c7707b +Subproject commit b4cda0cfe47c380e66bec389a374f0a9e63ee0a3 diff --git a/qtserialport b/qtserialport index 2a828454..dd9fdb2b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2a8284543018943ab581202cf934c751a22db6c7 +Subproject commit dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 diff --git a/qtspeech b/qtspeech index 5393b76f..84c00c48 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5393b76f3780b0be33cc727458993223605e5ab1 +Subproject commit 84c00c487fc6dd9f25ed7e3725fec2bb7641a9b5 diff --git a/qtsvg b/qtsvg index bdcd7a97..660012b6 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bdcd7a97449502f92069d36196cc81064b1c02a0 +Subproject commit 660012b62e62f6bf3a00e1194e7e22e41b7ffd8a diff --git a/qttools b/qttools index ad184840..f0da7c85 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ad18484063a41328d0e72c75cda151128977e0d8 +Subproject commit f0da7c856f667bb116b6dec0e0c16f3038af3b5e diff --git a/qttranslations b/qttranslations index 325a90e0..c397ffaf 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 325a90e07e9dce4e5c915549e6c31a86423dfdd3 +Subproject commit c397ffaf2cab888056354e40d84847ff5e83e061 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 31fcce58..49eabec1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 31fcce584aee8ad323b56ab2965a3dc66320adab +Subproject commit 49eabec1a99b3b2a1db05cb46d5402015391cedb diff --git a/qtwayland b/qtwayland index dbe33b17..6a28d13d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dbe33b1745d0fe5c553abaf841e045fa059ada1b +Subproject commit 6a28d13ded07280fbf0d877803001e40ebea36df diff --git a/qtwebchannel b/qtwebchannel index d84318e9..87044174 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d84318e98aa3cbac11b4f95b3581e95aab96a34a +Subproject commit 87044174033f141d8d333e2a442d826d87db0415 diff --git a/qtwebengine b/qtwebengine index d0441402..76583eb3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d044140246734b8851689f55197c03cfd29dec99 +Subproject commit 76583eb3e7656b96e5033bf8e1aba963ff899e19 diff --git a/qtwebsockets b/qtwebsockets index 0f32f4ef..15ca7cc0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0f32f4efc5a9a8b33369013c2ba6c27c78498cf2 +Subproject commit 15ca7cc061285dcaab1c650937c8f3a5bbbdfa28 diff --git a/qtwebview b/qtwebview index 3bcd4c35..74eb4d75 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3bcd4c3506c9352874f1403aba22e36108a867a2 +Subproject commit 74eb4d75808bb6800f87b9e562e2e467e4fad592 diff --git a/qtwinextras b/qtwinextras index f1e26328..ea7de894 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f1e26328e8f1abe9d87e369b0fe57954dfe68a87 +Subproject commit ea7de894f711d8fa4f6cf78b5a409889849ee1f2 diff --git a/qtx11extras b/qtx11extras index 90d5d612..d2cd52e4 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 90d5d612bc7b3450a7a9d5c37c2de1d150f95182 +Subproject commit d2cd52e4d7fe37e193f51e61805fccdfdf9bb221 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7b67fba8..cabba031 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7b67fba8bb21b06d423b68911b227fd1db22b1be +Subproject commit cabba031ad08a6134b83f4a5bbfb191a87acf461 From a1958e911cd40f9770b717a3555859613f6cede1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 13 Oct 2017 21:34:55 +0300 Subject: [PATCH 011/101] Update submodules on '5.9' in qt5 Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 9909ff10..5fa64386 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9909ff108e942ea0cd233d2cd3715f830c2ad89b +Subproject commit 5fa64386336b3072a12054726483e4850fc53dea diff --git a/qtconnectivity b/qtconnectivity index cbf95d0e..4bce1481 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cbf95d0ee78ad83cd26887670824e62678e4673e +Subproject commit 4bce1481c5cfbd402973c2a488b36499ed44af2e diff --git a/qtqa b/qtqa index 6a950622..50691867 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6a9506220bdb9c529463aad6eb28b79f1a8bfe99 +Subproject commit 5069186722a01ea4f47d13fb79f6939428dcc2e4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 378da672..b8141609 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 378da67208fe3d7f48ff3e494f5fe5984af407aa +Subproject commit b8141609d2ee962b919e1f05f7bd12ebc2ca9d11 diff --git a/qtrepotools b/qtrepotools index 21574ed0..c96847a7 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 21574ed0092c596d46bd4639262c1918ea28af6c +Subproject commit c96847a756798a3fa2d0a4c1395008676f00cfb0 diff --git a/qttools b/qttools index f0da7c85..c7a44cfb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f0da7c856f667bb116b6dec0e0c16f3038af3b5e +Subproject commit c7a44cfb5b243028bfe187715297c6deb2c09ffa diff --git a/qtwayland b/qtwayland index 6a28d13d..d8a83782 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6a28d13ded07280fbf0d877803001e40ebea36df +Subproject commit d8a8378248636060670c048edbf9933eed445d78 diff --git a/qtwebsockets b/qtwebsockets index 15ca7cc0..b05ec56d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 15ca7cc061285dcaab1c650937c8f3a5bbbdfa28 +Subproject commit b05ec56db6f17f04387af72b8e1b9a64b1092daa From a26ce5e56a783a2a9ef6353de55d43c3686bc27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 19 May 2017 14:27:35 +0300 Subject: [PATCH 012/101] Make CI use a new provisioned Win 10 template Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +++++----- coin/platform_configs/qt5.txt | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index a94a6371..fb4bda82 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests -qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-9 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-9 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 727dd7e9..0f6e9e93 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-7 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -17,7 +17,7 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From e09dc71d251014baf1432bb79167510af15e0277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 15 Sep 2017 10:46:18 +0300 Subject: [PATCH 013/101] Make Ninja provisioning use Add-Path function We should use this helper function now that we have it. Change-Id: I9a522533795d4d4e63f608a0624378f066055b10 Reviewed-by: Heikki Halmet --- coin/provisioning/common/ninja.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/ninja.ps1 index 75d74d36..0d21f799 100644 --- a/coin/provisioning/common/ninja.ps1 +++ b/coin/provisioning/common/ninja.ps1 @@ -8,5 +8,4 @@ Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2" Extract-Zip $zip C:\Utils\Ninja Remove-Item $zip -$machinePath = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine) -[Environment]::SetEnvironmentVariable("Path", $machinePath + ";C:\Utils\Ninja", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Utils\Ninja" From e8fc2166582da87ea7c6da06064f9ccf45e0e409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 19 Sep 2017 13:50:09 +0300 Subject: [PATCH 014/101] Make Extract-7zip helper function work with the new provision location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed the helper function for extracting 7z files so that it also supports the new C:\Utils\sevenzip location. Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/helpers.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d901e370..f6a9fd90 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -28,7 +28,10 @@ function Extract-7Zip if (-not (test-path $zipExe)) { $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe' if (-not (test-path $zipExe)) { - throw "Could not find 7-zip." + $zipExe = "C:\Utils\sevenzip\7z.exe" + if (-not (test-path $zipExe)) { + throw "Could not find 7-zip." + } } } } else { From 4cdfd8e902493b82dc8c140c9a5d5163106731d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 20 Sep 2017 09:13:26 +0300 Subject: [PATCH 015/101] Make 7zip provisioning script add 7zip to path 7zip is nice to have in path for future purposes such as when cherry-picking to other branches where we use different extracts scripts. Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332 Reviewed-by: Heikki Halmet --- coin/provisioning/common/install-sevenzip.ps1 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 index 1db41cc1..5f19543f 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -35,7 +35,8 @@ # This script installs 7-Zip -$version = "1604" +$version = "16.04" +$nonDottedVersion = "1604" if( (is64bitWinHost) -eq 1 ) { $arch = "-x64" @@ -46,15 +47,18 @@ else { $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4" } -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe" -$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe" -$7zPackage = "C:\Windows\Temp\7zip-$version.exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $nonDottedVersion + $arch + ".exe" +$url_official = "http://www.7-zip.org/a/7z" + $nonDottedVersion + $arch + ".exe" +$7zPackage = "C:\Windows\Temp\7zip-$nonDottedVersion.exe" +$7zTargetLocation = "C:\Utils\sevenzip\" Download $url_official $url_cache $7zPackage Verify-Checksum $7zPackage $sha1 -cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\" +Start-Process -FilePath $7zPackage -ArgumentList "/S","/D=$7zTargetLocation" -Wait echo "Cleaning $7zPackage.." Remove-Item -Recurse -Force "$7zPackage" +Add-Path $7zTargetLocation + echo "7-Zip = $version" >> ~\versions.txt From 128075f744130ef573cfa0f91b204493092525d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 12 Oct 2017 11:42:07 +0300 Subject: [PATCH 016/101] Fix typo in echoing version to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index c6a17530..49ea0754 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -84,10 +84,10 @@ try echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc - echo "Android SDK tools = $toolsVersion" >> ~/version.txt - echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/version.txt - echo "Android SDK API level = $sdkApiLevel" >> ~/version.txt - echo "Android NDK = $ndkVersion" >> ~/version.txt + echo "Android SDK tools = $toolsVersion" >> ~/versions.txt + echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt + echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt + echo "Android NDK = $ndkVersion" >> ~/versions.txt ) catch || { case $ex_code in From 5c7ccdbc833435890db890ea9c46569dbaecf8cc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Oct 2017 16:50:36 +0300 Subject: [PATCH 017/101] Update submodules on '5.9' in qt5 Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 3532ac70..6c5f580a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3532ac70ce69de608d14c24d18b42a6781edf4be +Subproject commit 6c5f580a0417f68f202a5b207a35c6ce0c8c0b73 diff --git a/qtbase b/qtbase index 5fa64386..3fd641c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5fa64386336b3072a12054726483e4850fc53dea +Subproject commit 3fd641c3141b49b334dcbdb1a25649525445b724 diff --git a/qtconnectivity b/qtconnectivity index 4bce1481..b171cdda 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4bce1481c5cfbd402973c2a488b36499ed44af2e +Subproject commit b171cddac0eac66294b7bb1a03ac051d7ec12d19 diff --git a/qtdeclarative b/qtdeclarative index 0af2998c..3b6eeee1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0af2998cc99e90e3df34f794801340d8a769c735 +Subproject commit 3b6eeee177b64eebe240d51be0c7bb5f031471d8 diff --git a/qtdoc b/qtdoc index 79d6e2a2..f6dfa843 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 79d6e2a28b9fe80b52a5d0e831a05dfbc186d9fe +Subproject commit f6dfa84372291277c04cf51deb2216a492a8d87b diff --git a/qtgamepad b/qtgamepad index cc3f8279..0e2408a2 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit cc3f8279abe1809772fdbe4780495244b508f510 +Subproject commit 0e2408a2729a5977182cb30d7e5ebd29a657673a diff --git a/qtimageformats b/qtimageformats index 8f142f0a..78dae6ab 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8f142f0aab7f92f1848fa2cf15dd6437b5af95a3 +Subproject commit 78dae6abac3909e138848c2a25495d5e893ed65a diff --git a/qtlocation b/qtlocation index 0e1ee18a..e9a42b7c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0e1ee18acd06c16d4d17427932c37fd2de9ce1fa +Subproject commit e9a42b7cfcbc5fc8a544d57a71316b922aeda271 diff --git a/qtmultimedia b/qtmultimedia index 9760c1ba..9a9bcd7d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9760c1baf8961c6e93a0a565d9611221ffbe1704 +Subproject commit 9a9bcd7da53ff3b2468ac37b45bf3de88a590332 diff --git a/qtnetworkauth b/qtnetworkauth index 60bb0cda..da3963e3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 60bb0cda6c27abaf39225e00aa38a858f91c1b86 +Subproject commit da3963e3d406b445223081cbdfe10858ba2036ae diff --git a/qtquickcontrols b/qtquickcontrols index 2430cc13..296810ea 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2430cc139437dac021b6028d8ba8799c50bd0e6c +Subproject commit 296810ea4bb4f734881a517eb101e5b948c1905b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b8141609..911d98ba 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b8141609d2ee962b919e1f05f7bd12ebc2ca9d11 +Subproject commit 911d98ba6c151feb27b30a39fab9fc5f634332e7 diff --git a/qtrepotools b/qtrepotools index c96847a7..ad7346df 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c96847a756798a3fa2d0a4c1395008676f00cfb0 +Subproject commit ad7346df2ee44889eb9aad1d6781edf4aa7c3ef2 diff --git a/qtscript b/qtscript index b98a47f7..95b51b00 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b98a47f7a243d75c97c2a6b04fbb9dd587de3430 +Subproject commit 95b51b007efdec4994f9c0e01b3a9609ffdedf21 diff --git a/qtspeech b/qtspeech index 84c00c48..8278f9f5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 84c00c487fc6dd9f25ed7e3725fec2bb7641a9b5 +Subproject commit 8278f9f5d2c9f47233f59ff8af757e0591045895 diff --git a/qtsvg b/qtsvg index 660012b6..c4c9b60d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 660012b62e62f6bf3a00e1194e7e22e41b7ffd8a +Subproject commit c4c9b60dc4bbe3c3837c80ea63682f3ef9403277 diff --git a/qttools b/qttools index c7a44cfb..f4a389c5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c7a44cfb5b243028bfe187715297c6deb2c09ffa +Subproject commit f4a389c5141ae82bb1924215e6406fb8fc35fb7f diff --git a/qttranslations b/qttranslations index c397ffaf..2578a31f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c397ffaf2cab888056354e40d84847ff5e83e061 +Subproject commit 2578a31f573d4f80a33153f4165216be59a51162 diff --git a/qtwayland b/qtwayland index d8a83782..fa7a1f77 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d8a8378248636060670c048edbf9933eed445d78 +Subproject commit fa7a1f77226795ece274b3505655e522881a0e24 diff --git a/qtwebengine b/qtwebengine index 76583eb3..94fc7199 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 76583eb3e7656b96e5033bf8e1aba963ff899e19 +Subproject commit 94fc71997ca8fb94fb1cba6f36eb9a24b6da4464 diff --git a/qtwebview b/qtwebview index 74eb4d75..71932e38 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 74eb4d75808bb6800f87b9e562e2e467e4fad592 +Subproject commit 71932e381ee12528f6516f61c5467f322d8ee903 diff --git a/qtx11extras b/qtx11extras index d2cd52e4..f21ef0cd 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d2cd52e4d7fe37e193f51e61805fccdfdf9bb221 +Subproject commit f21ef0cd01ccf1ccdbb2211eb935aff402741969 diff --git a/qtxmlpatterns b/qtxmlpatterns index cabba031..b257f032 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit cabba031ad08a6134b83f4a5bbfb191a87acf461 +Subproject commit b257f032350c555ea52a7dad5a52d0312ab93b5c From 357202801f5bdff61e69539e0ee7d2deee5c5143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Mon, 7 Aug 2017 09:56:49 +0300 Subject: [PATCH 018/101] Make CI use a new RHEL 7.4 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This commit replaces RHEL 7.2 in desktop builds, android builds and INTEGRITY builds. Task-number: QTQAINFRA-1251 Task-number: QTQAINFRA-1252 Task-number: QTQAINFRA-1253 Task-number: QTQAINFRA-1267 Task-number: QTQAINFRA-1269 Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 4 +- coin/platform_configs/qt5.txt | 8 +- coin/provisioning/common/android_linux.sh | 124 ++++++++++++++++++ .../disable_selinux.sh | 0 .../30-integrity.sh => common/integrity.sh} | 2 +- .../common/openssl_for_android_linux.sh | 85 ++++++++++++ .../10-qnx_700.sh => common/qnx_700.sh} | 4 +- .../01-linux-removethemall.sh | 1 - .../08-pythondev.sh | 18 --- .../qtci-linux-RHEL-7.2-x86_64/09-cmake.sh | 1 - .../40-android_linux.sh | 117 ----------------- .../rhel_packages.sh | 11 -- .../001-systemsetup.sh | 51 +++++++ .../002-enable-repos.sh | 2 + .../003-install-devtoolset6.sh | 40 ++++++ .../004-install-packages.sh | 98 ++++++++++++++ .../qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh | 42 ++++++ .../005-libclang.sh} | 0 .../qtci-linux-RHEL-7.4-x86_64/006-cmake.sh | 40 ++++++ .../qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh | 36 +++++ .../008-integrity.sh | 36 +++++ .../009-disable_selinux.sh | 36 +++++ .../009-install_icu.sh} | 53 ++++---- .../010-openssl_for_android_linux.sh | 37 ++++++ .../040-android_linux.sh | 36 +++++ 25 files changed, 700 insertions(+), 182 deletions(-) create mode 100644 coin/provisioning/common/android_linux.sh rename coin/provisioning/{qtci-linux-RHEL-7.2-x86_64 => common}/disable_selinux.sh (100%) rename coin/provisioning/{qtci-linux-RHEL-7.2-x86_64/30-integrity.sh => common/integrity.sh} (96%) create mode 100644 coin/provisioning/common/openssl_for_android_linux.sh rename coin/provisioning/{qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh => common/qnx_700.sh} (94%) delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh rename coin/provisioning/{qtci-linux-RHEL-7.2-x86_64/08-libclang.sh => qtci-linux-RHEL-7.4-x86_64/005-libclang.sh} (100%) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh rename coin/provisioning/{qtci-linux-RHEL-7.2-x86_64/install_icu.sh => qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh} (68%) mode change 100644 => 100755 create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index fb4bda82..41e4b407 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,12 +11,12 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static -qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0f6e9e93..47d1bd0c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,15 +9,15 @@ qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packagin qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh new file mode 100644 index 00000000..ee3008c1 --- /dev/null +++ b/coin/provisioning/common/android_linux.sh @@ -0,0 +1,124 @@ +#!/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$ +## +############################################################################# + +# This script install Android sdk and ndk. + +# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version + +source "${BASH_SOURCE%/*}/../common/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + +targetFolder="/opt/android" +sdkTargetFolder="$targetFolder/sdk" + +basePath="http://ci-files01-hki.intra.qt.io/input/android" + +toolsVersion="r25.2.5" +toolsFile="tools_$toolsVersion-linux.zip" +ndkVersion="r10e" +ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" +sdkBuildToolsVersion="25.0.2" +sdkApiLevel="android-21" + +toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1" +ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" + +toolsTargetFile="/tmp/$toolsFile" +toolsSourceFile="$basePath/$toolsFile" +ndkTargetFile="/tmp/$ndkFile" +ndkSourceFile="$basePath/$ndkFile" + +ExceptionDownload=99 +ExceptionUnzipTools=100 +ExceptionUnzipNdk=101 +ExceptionRmTools=102 +ExceptionRmNdk=103 +ExceptionSdkManager=104 + +try +( + (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload + (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload + echo "Unzipping Android NDK to '$targetFolder'" + sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk + echo "Unzipping Android Tools to '$sdkTargetFolder'" + sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools + rm "$ndkTargetFile" || throw $ExceptionRmNdk + rm "$toolsTargetFile" || throw $ExceptionRmTools + + echo "Changing ownership of Android files." + sudo chown -R qt:wheel "$targetFolder" + + echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + + echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc + echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc + echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc + echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc + + echo "Android SDK tools = $toolsVersion" >> ~/versions.txt + echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt + echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt + echo "Android NDK = $ndkVersion" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownload) + exit 1; + ;; + $ExceptionUnzipTools) + echo "Failed to unzip Android SDK Tools." + exit 1; + ;; + $ExceptionUnzipNdk) + echo "Failed to unzip Android NDK." + exit 1; + ;; + $ExceptionRmTools) + echo "Failed to remove temporary tools package '$toolsTargetFile'." + exit 1; + ;; + $ExceptionRmNdk) + echo "Failed to remove temporary NDK package '$ndkTargetFile'." + exit 1; + ;; + $ExceptionSdkManager) + echo "Failed to run sdkmanager." + exit 1; + ;; + esac +} + diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh rename to coin/provisioning/common/disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh b/coin/provisioning/common/integrity.sh similarity index 96% rename from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh rename to coin/provisioning/common/integrity.sh index ae637a44..6998866a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh +++ b/coin/provisioning/common/integrity.sh @@ -38,7 +38,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" version="11.4.4" -PrimaryUrl="http://ci-files01-hki.ci.local/input/integrity/ghs_$version.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" AltUrl="$PrimaryUrl" # we lack an external source for this SHA1="4afa3c15e13c91734951b73f6b21388294c5d794" targetFolder="/opt/ghs" diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh new file mode 100644 index 00000000..70684eaf --- /dev/null +++ b/coin/provisioning/common/openssl_for_android_linux.sh @@ -0,0 +1,85 @@ +#!/bin/env 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$ +## +############################################################################# + +# This script install OpenSSL from sources. +# Requires GCC and Perl to be in PATH. + +source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +version="1.0.2g" +officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" +targetFile="/tmp/openssl-$version.tar.gz" +installFolder="/home/qt/" +sha="36af23887402a5ea4ebef91df8e61654906f58f2" +# Until every VM doing Linux Android builds have provisioned the env variable +# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. +# QTQAINFRA-1436 +opensslHome="${installFolder}openssl-1.0.2" + +ExceptionDownload=99 +ExceptionTar=100 +ExceptionConfig=101 + +try +( + (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload + + tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar + # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) + mv "${opensslHome}g" "${opensslHome}" + pushd "$opensslHome" + perl Configure shared android || throw $ExceptionConfig + + echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc + echo "OpenSSL for Android = $version" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownload) + exit 1; + ;; + $ExceptionTar) + echo "Failed to extract $targetFile" + exit 1; + ;; + $ExceptionConfig) + echo "Failed to run 'config'." + exit 1; + ;; + esac + +} diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh b/coin/provisioning/common/qnx_700.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh rename to coin/provisioning/common/qnx_700.sh index 8a38c054..0c27e2af 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -37,7 +37,7 @@ set -e targetFolder="/opt/" -sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" folderName="qnx700" targetFile="qnx700.tar.xz" @@ -60,5 +60,5 @@ fi rm -rf $targetFile # Set env variables -echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc +echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh deleted file mode 100644 index 38194671..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh +++ /dev/null @@ -1 +0,0 @@ -"${BASH_SOURCE%/*}/../common/linux-removethemall.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh deleted file mode 100644 index ff25f463..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ /dev/null @@ -1,18 +0,0 @@ -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -sudo yum install -y python-devel python-virtualenv - -# install the EPEL repository which provides python3 -wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -sudo rpm -Uvh epel-release-latest-7.noarch.rpm -sudo rm -f epel-release-latest-7.noarch.rpm - -# install python3 -sudo yum install -y python34-devel - -# install pip3 -wget https://bootstrap.pypa.io/get-pip.py -sudo python3 get-pip.py -sudo rm -f get-pip.py -sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh deleted file mode 100644 index d7abd285..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh deleted file mode 100644 index 87569d72..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/env 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$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 - -# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -set -e -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" - -# SDK -sdkPackage="android-sdk_r24.4.1-linux.tgz" -sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-21" -sdkUrl="$baseUrl/$sdkPackage" -sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkPackage" -sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" -sdkFolderName="android-sdk-linux" -sdkName="sdk" - -# NDK -ndkVersion="r10e" -ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkPackage" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkPackage" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-$ndkVersion" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" - echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo chmod 755 "$targetFile" - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users "$targetFolder"/"$folderName" - sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" - sudo rm -fr "$targetFolder"/"$version" -} - -sudo mkdir "$targetFolder" - -# Install Android SDK -echo "Installing Android SDK version $sdkPackage..." -InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkPackage..." -InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" - -# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 -# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. -# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "***** Android SDK *****" >> ~/versions.txt -echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt -platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" -echo "Android Platform Tools = $platformTools" >> ~/versions.txt -sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" -echo "Android SDK Tools = $sdkTools" >> ~/versions.txt -echo "***** Android NDK *****" >> ~/versions.txt -echo "Android NDK Version = $ndkVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh deleted file mode 100644 index daf3efab..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh +++ /dev/null @@ -1,11 +0,0 @@ -# gstreamer 1 for QtMultimedia -# gtk3 style for QtGui/QStyle -# libusb1 for tqtc-boot2qt/qdb -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux - -sudo yum install -y \ - gstreamer1-devel gstreamer1-plugins-base-devel \ - gtk3-devel \ - libusb1-devel \ - speech-dispatcher-devel - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh new file mode 100755 index 00000000..22bf19a3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh @@ -0,0 +1,51 @@ +#!/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$ +## +############################################################################# + +set -e + +BASEDIR=$(dirname "$0") +source $BASEDIR/../common/network_test_server_ip.txt + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc +# for current session +export DISPLAY=:0 + +# disable Automatic screen lock +gsettings set org.gnome.desktop.screensaver lock-enabled false +# disable blank screen power saving +gsettings set org.gnome.desktop.session idle-delay 0 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh new file mode 100755 index 00000000..2697de04 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms 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-devtoolset6.sh new file mode 100755 index 00000000..ef65b881 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh @@ -0,0 +1,40 @@ +#!/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$ +## +############################################################################# + +sudo yum-config-manager --enable rhel-server-rhscl7-rpms +sudo yum -y install devtoolset-6 + +echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc + 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 new file mode 100755 index 00000000..f7c6b694 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -0,0 +1,98 @@ +#!/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$ +## +############################################################################# + +set -e + +sudo yum -y update + +sudo yum -y install git +sudo yum -y install zlib-devel +sudo yum -y install glib2-devel +sudo yum -y install openssl-devel +sudo yum -y install freetype-devel +sudo yum -y install fontconfig-devel + +# EGL support +sudo yum -y install mesa-libEGL-devel +sudo yum -y install mesa-libGL-devel + +sudo yum -y install libxkbfile-devel + +# Xinput2 +sudo yum -y install libXi-devel + +sudo yum -y install python-devel +sudo yum -y install mysql-server mysql +sudo yum -y install mysql-devel +sudo yum -y install postgresql-devel +sudo yum -y install cups-devel +sudo yum -y install dbus-devel + +# We have to downgrade to an older version of graphite2 +# to avoid a dependency version mismatch with gtk3-devel package. + +sudo yum -y downgrade graphite2-1.3.6-1.el7_2 + +# gstreamer 1 for QtMultimedia +sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel + +# gtk3 style for QtGui/QStyle +sudo yum -y install gtk3-devel + +# libusb1 for tqtc-boot2qt/qdb +sudo yum -y install libusb-devel + +# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +sudo yum -y install speech-dispatcher-devel + +# Python +sudo yum -y install python-devel python-virtualenv + +# WebEngine +sudo yum -y install bison +sudo yum -y install flex +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 + +# For Android builds +sudo yum -y install java-1.8.0-openjdk-devel + +# For receiving shasum +sudo yum -y install perl-Digest-SHA + +# INTEGRITY requirements +sudo yum -y install glibc.i686 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh new file mode 100755 index 00000000..d21fab6c --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh @@ -0,0 +1,42 @@ +#!/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$ +## +############################################################################# + +sudo wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm +sudo rpm -ivh epel-release-7-10.noarch.rpm +sudo yum -y install p7zip +sudo rm epel-release-7-10.noarch.rpm + +# Link 7za to 7z so we can use existing installation scripts +sudo ln -s /usr/bin/7za /usr/bin/7z diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh new file mode 100755 index 00000000..46976e9a --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh @@ -0,0 +1,40 @@ +#!/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$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +source "${BASH_SOURCE%/*}/../common/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh new file mode 100755 index 00000000..4a4031cc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh @@ -0,0 +1,36 @@ +#!/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/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh new file mode 100755 index 00000000..56b1556d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh @@ -0,0 +1,36 @@ +#!/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/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh new file mode 100755 index 00000000..3eced1a4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh @@ -0,0 +1,36 @@ +#!/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/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh old mode 100644 new mode 100755 similarity index 68% rename from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh index 682ea91c..b51c9c8c --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh @@ -1,11 +1,11 @@ -#!/bin/env bash +#!/bin/bash ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## 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. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -33,38 +33,41 @@ ## ############################################################################# -# This script installs the right ICU version - set -e + +# This script will install ICU + icuVersion="56.1" icuLocation="/usr/lib64" sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" - -function Install7ZPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 - - targetFile=`mktemp` || echo "Failed to create temporary file" - wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" - echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive" - rm $targetFile -} - -echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" - baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" -Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64" - -echo "Installing custom ICU devel packages on RHEL" sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +targetFile=`mktemp` || echo "Failed to create temporary file" +wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL || echo "Failed to download '$baseBinaryPackageURL' multiple times" +echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" +sudo 7z x -y -o"/usr/lib64" $targetFile || echo "Failed to unzip $baseBinaryPackageURL archive" +sudo rm $targetFile + +echo "Installing custom ICU devel packages on RHEL" + tempDir=`mktemp -d` || echo "Failed to create temporary directory" -trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir + +targetFile=`mktemp` || echo "Failed to create temporary file" +wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL || echo "Failed to download '$develPackageURL' multiple times" +echo "$sha1Dev $targetFile" | sha1sum --check || echo "Failed to check sha1sum" +7z x -y -o$tempDir $targetFile || echo "Failed to unzip $develPackageURL archive" + sudo cp -a $tempDir/lib/* /usr/lib64 sudo cp -a $tempDir/* /usr/ +sudo rm $targetFile +sudo rm -fr $tempDir + sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt 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 new file mode 100755 index 00000000..05b73729 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -0,0 +1,37 @@ +#!/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 /opt/rh/devtoolset-6/enable +source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh new file mode 100755 index 00000000..637c4224 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh @@ -0,0 +1,36 @@ +#!/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/android_linux.sh" From 5f76910476c3186f1fd7bca2b3a304226ba6f76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 25 Apr 2017 23:04:25 +0300 Subject: [PATCH 019/101] Provision ICC to openSUSE 42.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1196 Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf Reviewed-by: Simo Fält --- coin/platform_configs/default.txt | 1 + .../018-icc.sh | 85 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 41e4b407..b8b8934d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,6 +10,7 @@ qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2015 qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh new file mode 100755 index 00000000..4933269a --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -0,0 +1,85 @@ +#!/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$ +## +############################################################################# + +# This script install Intel Parallel Studio XE Composer Edition for C++ Linux + +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + +set -e + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.0 20170811" >> ~/versions.txt + +rm -rf "$iccTmpPath" From f129af9f8139c2c8b4276e550f0696cef56b9b16 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Oct 2017 12:25:11 +0200 Subject: [PATCH 020/101] Add mozilla-nss-devel to opensuse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWebEngine now depends hard on NSS as the OpenSSL backend never worked well on Linux. Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 1f6b9070..fb2b81dd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -44,3 +44,5 @@ sudo zypper -nq install libXcomposite-devel sudo zypper -nq install libXcursor-devel sudo zypper -nq install libXrandr-devel sudo zypper -nq install libXtst-devel +sudo zypper -nq install mozilla-nspr-devel +sudo zypper -nq install mozilla-nss-devel From 3b7b924b31f28c38068e99d4637a90e34362a685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 19 Oct 2017 15:53:34 +0300 Subject: [PATCH 021/101] Fix Windows 10 x64 Python with new tier 1 Current tier 1 template #9 has python and anaconda installed that came with MSVC2017. This messes with the provisioning scripts and ultimately builds such as pyside, even though qt5 builds go through. Task-number: QTQAINFRA-1503 Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +++++----- coin/platform_configs/qt5.txt | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b8b8934d..ea31b802 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests -qtci-windows-10-x86_64-9 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-9 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 47d1bd0c..0a4da169 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-9 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -16,8 +16,8 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 372d2bb0764724cd5239ad47ad71927eef7ab090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sun, 3 Sep 2017 08:30:17 +0300 Subject: [PATCH 022/101] Provision vanilla Windows 7 x86 and use it Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 6 +- coin/platform_configs/qtwebkit.txt | 2 +- coin/provisioning/common/install-java.ps1 | 6 ++ coin/provisioning/common/install-jdk.ps1 | 78 +++++++++++++++++++ .../01-allow-remote-desktop-access.ps1 | 1 + .../qtci-windows-7-x86/01-disable-uac.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 - .../qtci-windows-7-x86/02-disable-sleep.ps1 | 1 + .../02-install-notepad++.ps1 | 1 + .../03-install-sevenzip.ps1 | 1 + ...efender.ps1 => 04-disable-windefender.ps1} | 0 .../04-disable-windows-updates.ps1 | 1 + ...005-wsearch-off.ps1 => 05-wsearch-off.ps1} | 0 .../qtci-windows-7-x86/07-android_openssl.ps1 | 32 -------- .../qtci-windows-7-x86/08-install-git.ps1 | 1 + .../qtci-windows-7-x86/08-install-jdk.ps1 | 1 + .../{cmake.ps1 => 09-cmake.ps1} | 0 .../09-install-dependencywalker.ps1 | 1 + .../09-install-mingw530.ps1 | 10 +++ .../qtci-windows-7-x86/09-install-ruby.ps1 | 1 + .../09-install-strawberry-perl.ps1 | 1 + .../{jom.ps1 => 09-jom.ps1} | 0 .../qtci-windows-7-x86/09-mysql.ps1 | 1 + .../qtci-windows-7-x86/09-openssl.ps1 | 1 + .../qtci-windows-7-x86/09-postgresql.ps1 | 1 + .../09-set-network-test-server.ps1 | 1 + .../qtci-windows-7-x86/10-dxsdk.ps1 | 19 +++++ .../{icu.ps1 => 12-icu.ps1} | 0 .../qtci-windows-7-x86/25-python.ps1 | 1 + .../{python3.ps1 => 25-python3.ps1} | 0 .../{06-android.ps1 => 30-android.ps1} | 33 ++++++++ .../qtci-windows-7-x86/31-android_openssl.ps1 | 69 ++++++++++++++++ 33 files changed, 236 insertions(+), 38 deletions(-) create mode 100644 coin/provisioning/common/install-jdk.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 rename coin/provisioning/qtci-windows-7-x86/{004-disable-windefender.ps1 => 04-disable-windefender.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 rename coin/provisioning/qtci-windows-7-x86/{005-wsearch-off.ps1 => 05-wsearch-off.ps1} (100%) delete mode 100644 coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 rename coin/provisioning/qtci-windows-7-x86/{cmake.ps1 => 09-cmake.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 rename coin/provisioning/qtci-windows-7-x86/{jom.ps1 => 09-jom.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 rename coin/provisioning/qtci-windows-7-x86/{icu.ps1 => 12-icu.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-7-x86/25-python.ps1 rename coin/provisioning/qtci-windows-7-x86/{python3.ps1 => 25-python3.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{06-android.ps1 => 30-android.ps1} (63%) create mode 100644 coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ea31b802..672b22a2 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,7 +2,7 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic +qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0a4da169..5eea413c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -6,12 +6,12 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagi qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 7c8e8ac5..521191bb 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -2,4 +2,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 index 4b9dd097..50f12c89 100644 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/install-java.ps1 @@ -36,6 +36,8 @@ # This script will install Java RE # Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. +$installdir = "C:\Program Files\Java\jre7" + $version = "7u7" if( (is64bitWinHost) -eq 1 ) { $arch = "x64" @@ -53,4 +55,8 @@ Copy-Item $url_cache $javaPackage cmd /c "$javaPackage /s SPONSORS=0" echo "Cleaning $javaPackage.." Remove-Item -Recurse -Force "$javaPackage" + +[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) +Add-Path "$installdir\bin" + echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/common/install-jdk.ps1 b/coin/provisioning/common/install-jdk.ps1 new file mode 100644 index 00000000..e4260deb --- /dev/null +++ b/coin/provisioning/common/install-jdk.ps1 @@ -0,0 +1,78 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Java SE + +$installdir = "C:\Program Files\Java\jdk1.8.0_144" + +$version = "8u144" +if( (is64bitWinHost) -eq 1 ) { + $arch = "x64" + $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858" +} +else { + $arch = "i586" + $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe" +$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe" +$javaPackage = "C:\Windows\Temp\jdk-$version.exe" + +echo "Fetching Java SE $version..." +$ProgressPreference = 'SilentlyContinue' +try { + echo "...from local cache" + Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage +} catch { + echo "...from oracle.com" + $client = new-object System.Net.WebClient + $cookie = "oraclelicense=accept-securebackup-cookie" + $client.Headers.Add("Cookie", $cookie) + $client.DownloadFile($official_url, $javaPackage) + + Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage +} + +Verify-Checksum $javaPackage $sha1 + +cmd /c "$javaPackage /s SPONSORS=0" +echo "Cleaning $javaPackage.." +Remove-Item -Recurse -Force "$javaPackage" + +[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) +Add-Path "$installdir\bin" + +echo "Java SE = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 new file mode 100644 index 00000000..2303699c --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 rename to coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 deleted file mode 100644 index 553f9560..00000000 --- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 +++ /dev/null @@ -1,32 +0,0 @@ -. "$PSScriptRoot\..\common\helpers.ps1" - -# OpenSSL need to be configured from sources for Android build in windows 7 -# Msys need to be installed to target machine -# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html - -$version = "1.0.2j" -$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" -$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" -$destination = "C:\Utils\openssl-android-master" - -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 - -C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils -C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils -Remove-Item $destination -Force -Recurse -Rename-Item C:\Utils\openssl-$version $destination -Remove-Item $zip -Remove-Item C:\Utils\openssl-$version.tar - -set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc -set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar -set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr -$env:Path = $env:Path + ";C:\msys\1.0\bin" - -echo "Configuring OpenSSL $version for Android..." -cd $destination -C:\msys\1.0\bin\bash.exe -c "perl Configure shared android" - -# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. -# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/cmake.ps1 rename to coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 new file mode 100644 index 00000000..7c4cd8ac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 5.3.0 + +$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" +$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" + +InstallMinGW $release $sha1 + + diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/jom.ps1 rename to coin/provisioning/qtci-windows-7-x86/09-jom.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 new file mode 100644 index 00000000..a41035da --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 new file mode 100644 index 00000000..92339a45 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 new file mode 100644 index 00000000..ba194de6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 @@ -0,0 +1,19 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs DirectX SDK + +$package = "DXSDK_Jun10.exe" + +$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" +$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" +$exe = "C:\Windows\Temp\$package" + +Download $officialUrl $cachedUrl $exe + +echo "Installing DirectX SDK" +cmd /c "$exe /u" + +Remove-Item $exe + +echo "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/icu.ps1 rename to coin/provisioning/qtci-windows-7-x86/12-icu.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/python3.ps1 rename to coin/provisioning/qtci-windows-7-x86/25-python3.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 similarity index 63% rename from coin/provisioning/qtci-windows-7-x86/06-android.ps1 rename to coin/provisioning/qtci-windows-7-x86/30-android.ps1 index 5dcc21ac..f355a5de 100644 --- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 @@ -1,3 +1,36 @@ +############################################################################ +## +## 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$ +## +############################################################################# + . "$PSScriptRoot\..\common\helpers.ps1" # This script installs Android sdk and ndk diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 new file mode 100644 index 00000000..4f2b74eb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 @@ -0,0 +1,69 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +# Requires: 7z, perl and msys + +. "$PSScriptRoot\..\common\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$destination = "C:\Utils\openssl-android-master" + +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr + +# Make sure configure for openssl has a "make" and "perl" available +$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" + +echo "Configuring OpenSSL $version for Android..." +pushd $destination +C:\msys\1.0\bin\bash.exe -c "c:/strawberry/perl/bin/perl Configure shared android" +popd + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h From 1b798a59a3eae19971675036e09c7812acbbdc09 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Oct 2017 23:19:57 +0300 Subject: [PATCH 023/101] Update submodules on '5.9' in qt5 Change-Id: Ica9109b0b5868ccc60043b5c861e853837bd9213 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 6c5f580a..294eefef 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6c5f580a0417f68f202a5b207a35c6ce0c8c0b73 +Subproject commit 294eefef0f8cfdba2edd73b5bd2ba7435b102ce5 diff --git a/qtactiveqt b/qtactiveqt index 778f0874..687ed28d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 778f08748dc212d0a3b920a19c410117e277b47d +Subproject commit 687ed28dc2e17dac9ddcca20a83b717e3f7cd3f3 diff --git a/qtbase b/qtbase index 3fd641c3..9c58dd15 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3fd641c3141b49b334dcbdb1a25649525445b724 +Subproject commit 9c58dd15885d813aeb5d83d2869c0f3a3ee5fcfe diff --git a/qtcharts b/qtcharts index fb4bd5cf..ab6f94d6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fb4bd5cfec5ca9257b3d756fce0f379085afa0f2 +Subproject commit ab6f94d6fb186d0003679fb4541c939555fd01c9 diff --git a/qtdeclarative b/qtdeclarative index 3b6eeee1..e42b2e8d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3b6eeee177b64eebe240d51be0c7bb5f031471d8 +Subproject commit e42b2e8d4922a5942839850d0b031fcb19521545 diff --git a/qtdoc b/qtdoc index f6dfa843..07446998 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f6dfa84372291277c04cf51deb2216a492a8d87b +Subproject commit 07446998a4d75ceb6376dd674b9e9426b170ae6b diff --git a/qtimageformats b/qtimageformats index 78dae6ab..feca51d8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 78dae6abac3909e138848c2a25495d5e893ed65a +Subproject commit feca51d8c714781378cecc99122035348e0459bb diff --git a/qtmultimedia b/qtmultimedia index 9a9bcd7d..2ec48548 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9a9bcd7da53ff3b2468ac37b45bf3de88a590332 +Subproject commit 2ec485482d185f92e4de33f634bc3ef9dd6c9188 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 911d98ba..c08964f0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 911d98ba6c151feb27b30a39fab9fc5f634332e7 +Subproject commit c08964f0bb6b2622f94b377679d6689e6d960017 diff --git a/qtremoteobjects b/qtremoteobjects index 89a8f31e..1d95be3c 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 89a8f31e82c34b3935a73213ecc8c977a9edc3dd +Subproject commit 1d95be3c4a36b2e369b4ba3171581f0a7d5095ba diff --git a/qtscript b/qtscript index 95b51b00..c5b7db2e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 95b51b007efdec4994f9c0e01b3a9609ffdedf21 +Subproject commit c5b7db2e5cbc4477da75691602af1cc5fad10af0 diff --git a/qtserialbus b/qtserialbus index b4cda0cf..9cfcc2f9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b4cda0cfe47c380e66bec389a374f0a9e63ee0a3 +Subproject commit 9cfcc2f9868759dc679c0cf4532fb1c0883451d0 diff --git a/qtwayland b/qtwayland index fa7a1f77..5f38652c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fa7a1f77226795ece274b3505655e522881a0e24 +Subproject commit 5f38652cd52c03e9df8600f5f41e044820c3062c diff --git a/qtwebengine b/qtwebengine index 94fc7199..b2c1d565 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 94fc71997ca8fb94fb1cba6f36eb9a24b6da4464 +Subproject commit b2c1d565cc4c704dfb266d1291dd50a9e4d1c4bc diff --git a/qtwebsockets b/qtwebsockets index b05ec56d..e962127c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b05ec56db6f17f04387af72b8e1b9a64b1092daa +Subproject commit e962127cb9afbd3cf59d80931b76b1e6800f146f From 1376f16f3bd9e3f9c5cae536e209f11c368982ae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Oct 2017 22:40:55 +0300 Subject: [PATCH 024/101] Update submodules on '5.9' in qt5 Change-Id: I903ba51634aa67a83e980c125ccc7d063e12ca73 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 9c58dd15..d020d3f4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9c58dd15885d813aeb5d83d2869c0f3a3ee5fcfe +Subproject commit d020d3f4ede280d998e3b7069a39e134dc9319a5 diff --git a/qtconnectivity b/qtconnectivity index b171cdda..75126f6d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b171cddac0eac66294b7bb1a03ac051d7ec12d19 +Subproject commit 75126f6d12c90610b80399ea8337766791e7f62b diff --git a/qtdeclarative b/qtdeclarative index e42b2e8d..2416b9d6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e42b2e8d4922a5942839850d0b031fcb19521545 +Subproject commit 2416b9d6cc2950395151c18a7f7bfceb4b7fc693 diff --git a/qtlocation b/qtlocation index e9a42b7c..592c3815 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e9a42b7cfcbc5fc8a544d57a71316b922aeda271 +Subproject commit 592c381564e3f12b79a3d5e9fec5aec2b8045742 diff --git a/qtmultimedia b/qtmultimedia index 2ec48548..08db8a40 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2ec485482d185f92e4de33f634bc3ef9dd6c9188 +Subproject commit 08db8a408829cb3bbd204e71dd8d5616e7d21d3d diff --git a/qtwayland b/qtwayland index 5f38652c..ebd732df 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5f38652cd52c03e9df8600f5f41e044820c3062c +Subproject commit ebd732dfc91d5607b7ec66e3ab25a7db0a86244c From 72cc04772620ab7bfa65f5105bbffc2c9092c0bc Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 27 Sep 2017 14:37:22 +0300 Subject: [PATCH 025/101] Fix QNX platform configurations for Qt 5.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With Qt 5.9 series we still deliver binaries for QNX 6.6 only -> - Add QNX 6.6 platform configurations for windows - Remove 'packaging' flag from QNX 7.0 builds - Add provisioning script to patch QNX in windows 10 as well This change fixes the previous 5.6 merge, where this should've happened. Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893 Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 10 ++++++---- coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5eea413c..21c00e9d 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,8 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" From 81f832f0a6a854ce29caf491d4eecf4bc793d02d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Oct 2017 10:52:51 +0300 Subject: [PATCH 026/101] Update submodules on '5.9' in qt5 Change-Id: Id803fd815a34d0adad0e3c02cb4373b78e9a9eab Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 687ed28d..cacf666f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 687ed28dc2e17dac9ddcca20a83b717e3f7cd3f3 +Subproject commit cacf666f95df9790cebf5d5cdb0609cee257fab3 diff --git a/qtbase b/qtbase index d020d3f4..0bd4b194 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d020d3f4ede280d998e3b7069a39e134dc9319a5 +Subproject commit 0bd4b194d13b76456fa74330f40cc76a0a2d2b80 diff --git a/qtconnectivity b/qtconnectivity index 75126f6d..6029bad7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 75126f6d12c90610b80399ea8337766791e7f62b +Subproject commit 6029bad7d1007aecd155985ba13d6c23a01015b8 diff --git a/qtdeclarative b/qtdeclarative index 2416b9d6..742e869a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2416b9d6cc2950395151c18a7f7bfceb4b7fc693 +Subproject commit 742e869afe2dbba6aae6302d20ba9c82f3ed99c6 diff --git a/qtlocation b/qtlocation index 592c3815..467bcda1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 592c381564e3f12b79a3d5e9fec5aec2b8045742 +Subproject commit 467bcda16b0589a75d6b81d4b475a90cecae129d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c08964f0..4c0aac07 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c08964f0bb6b2622f94b377679d6689e6d960017 +Subproject commit 4c0aac07d422e8bce9dfc7f8345e2af62217e886 diff --git a/qtserialbus b/qtserialbus index 9cfcc2f9..60c0114e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9cfcc2f9868759dc679c0cf4532fb1c0883451d0 +Subproject commit 60c0114e846a593895503a78d13b006f93e95675 diff --git a/qttools b/qttools index f4a389c5..779002b1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f4a389c5141ae82bb1924215e6406fb8fc35fb7f +Subproject commit 779002b14dc2e9e4eb22f2c2c243f3da12fa4c72 diff --git a/qtwayland b/qtwayland index ebd732df..f1407493 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ebd732dfc91d5607b7ec66e3ab25a7db0a86244c +Subproject commit f1407493d6d25f24a3c71fbcedc00598baa44b56 diff --git a/qtwebengine b/qtwebengine index b2c1d565..3938260c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b2c1d565cc4c704dfb266d1291dd50a9e4d1c4bc +Subproject commit 3938260c7dcceee5cbf184d497b3b72d8b7a4910 From 185eb5b414e202419a807973244432419841905d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 26 Oct 2017 14:06:14 +0300 Subject: [PATCH 027/101] Cleanup of provisioning scripts as tier1 images are vanilla Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7 Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 6 -- .../common/linux-removethemall.sh | 49 --------------- coin/provisioning/common/mysql.ps1 | 5 -- coin/provisioning/common/postgresql.ps1 | 5 -- coin/provisioning/common/qnx_700.sh | 3 - .../common/windows_removethemall.ps1 | 61 ------------------- .../01-windows_removethemall.ps1 | 1 - .../01-windows_removethemall.ps1 | 1 - 8 files changed, 131 deletions(-) delete mode 100755 coin/provisioning/common/linux-removethemall.sh delete mode 100644 coin/provisioning/common/windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 8a94dc5d..1716467c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -44,12 +44,6 @@ Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: -# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS -if((Test-Path -Path "C:\CMake" )){ - try { - Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old - } catch {} -} $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/common/linux-removethemall.sh deleted file mode 100755 index 4386ec74..00000000 --- a/coin/provisioning/common/linux-removethemall.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/env 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$ -## -############################################################################# - -# This script removes preinstalled sw. -# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script - -function RemoveDir { - targetFolder=$1 - - if [ -d "$targetFolder" ]; then - echo "Removing existing $targetFolder..." - sudo rm -fr "$targetFolder" - fi -} - -# Android -RemoveDir /opt/android diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1 index e300566e..63088861 100644 --- a/coin/provisioning/common/mysql.ps1 +++ b/coin/provisioning/common/mysql.ps1 @@ -57,11 +57,6 @@ function DownloadAndInstall Remove-Item $package } -# Remove any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted -} catch {} - if( (is64bitWinHost) -eq 1 ) { # Install x64 bit version $architecture = "x64" diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 index dd5858a3..ca47f078 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/postgresql.ps1 @@ -48,11 +48,6 @@ if( (is64bitWinHost) -eq 1 ) { $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" - # Delete any leftovers - try { - Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted - } catch {} - echo "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 Verify-Checksum $packagex64 $sha1 diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh index 0c27e2af..0b17a7a0 100644 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -46,9 +46,6 @@ echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -if [ -d "$targetFolder/$folderName" ]; then - rm -rf $targetFolder/$folderName -fi sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile" sudo chown -R qt:users "$targetFolder"/"$folderName" diff --git a/coin/provisioning/common/windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1 deleted file mode 100644 index 0e584900..00000000 --- a/coin/provisioning/common/windows_removethemall.ps1 +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -Function Remove { -Param ( - [string]$1 - ) - If (Test-Path $1){ - echo "Remove $1" - Remove-Item -Recurse -Force $1 - }Else{ - echo "'$1' does not exists or already removed !!" - } - -} - -Function Remove-Path { - Param ( - [string]$Path - ) - echo "Remove $path from Path" - $name = "Path" - $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" - $type = "Machine" - [System.Environment]::SetEnvironmentVariable($name,$value,$type) -} - -# Remove Android sdk and ndk -dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" } -[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") -[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User") diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" From 583e196784646a5d64fb7c83c33e1255d8c911a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 26 Oct 2017 15:02:50 +0300 Subject: [PATCH 028/101] Cleanup of opengl32.dll replacement This one isn't needed as the vanilla OS already contains the original file. Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86_64/opengl32_x86.ps1 | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 deleted file mode 100644 index ee101fa5..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -$version = "11_2_2" -$openglPackage = "C:\Windows\SysWOW64\opengl32.dll" - -$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll" -$openglSha1 = "690730f973aa39bd80648e026248394fde07a753" - -echo "Take ownership of existing opengl32.dll from SysWOW64" -takeown /f $openglPackage -icacls $openglPackage /grant Administrators:F -echo "Remove existing opengl32.dll from SysWOW64" -Remove-Item -Recurse -Force $openglPackage -echo "Add new opengl32.dll to SysWOW64" -Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage -Verify-Checksum $openglPackage $openglSha1 - -# Store version information to ~/versions.txt -echo "OpenGL x86 = $version" >> ~/versions.txt From 4b73d4a666490ca4df1e44b3a2d00cafbda2bed8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 Oct 2017 22:18:58 +0300 Subject: [PATCH 029/101] Update submodules on '5.9' in qt5 Change-Id: I72963749ae7d3756933c0a561f06fc90adc59dc8 Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 0bd4b194..9f0dda29 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0bd4b194d13b76456fa74330f40cc76a0a2d2b80 +Subproject commit 9f0dda29d5d070f63b7f098139f01f07ec91ffdf diff --git a/qtmultimedia b/qtmultimedia index 08db8a40..5b42ce74 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 08db8a408829cb3bbd204e71dd8d5616e7d21d3d +Subproject commit 5b42ce74199671f88ee82c971ebff70f87c018db diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4c0aac07..1d39e62a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4c0aac07d422e8bce9dfc7f8345e2af62217e886 +Subproject commit 1d39e62ada99d85a411e1d6fc26925e342f5b59b diff --git a/qtwebengine b/qtwebengine index 3938260c..399d77a3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3938260c7dcceee5cbf184d497b3b72d8b7a4910 +Subproject commit 399d77a38ff52d33dc871a5b221db253308b7436 diff --git a/qtwebsockets b/qtwebsockets index e962127c..203da360 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e962127cb9afbd3cf59d80931b76b1e6800f146f +Subproject commit 203da360c4bcd64bdd17639d495f1857b622e92d From 16249a5fceec0ceb27fe69e43c89a7f7c89c223b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 1 Nov 2017 13:58:30 +0100 Subject: [PATCH 030/101] 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 d068364935ce55aa7fee60a2ba52e3c199bbe5f4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 2 Nov 2017 13:14:14 +0100 Subject: [PATCH 031/101] Update submodules on '5.10' in qt5 Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index f263d206..c9acfe0b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f263d206341472e23e0e1ad536faa1b0a22286c0 +Subproject commit c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda diff --git a/qtandroidextras b/qtandroidextras index b5f423f5..ae4f854d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b5f423f50a67d7e1ff416e4348517332d46f780f +Subproject commit ae4f854d754ea189be13ef740d631fdb7a72c9a5 diff --git a/qtbase b/qtbase index 76a6b329..ea0e868c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76a6b3294223f52568cd8c6190edceedbdca70ce +Subproject commit ea0e868c4881944207e9b3a77011e05a505ff3b7 diff --git a/qtcanvas3d b/qtcanvas3d index 3b24ef25..af33e20a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 3b24ef25fa328bf993891e242c0c3ff677fafbcb +Subproject commit af33e20a04f3228f7bf39137b1cfbbf3cdf68544 diff --git a/qtconnectivity b/qtconnectivity index 013ad057..0d2f4356 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 013ad0570844975cd5c72a77d1cfefa30c3ea656 +Subproject commit 0d2f435672288d1084bfb6156503b6a5afe54827 diff --git a/qtdatavis3d b/qtdatavis3d index 0565aadd..ee68813c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 0565aadd971adb0fa0c09b6f9d04cc1cef1b12fd +Subproject commit ee68813c81d5c3d40af6d362f851d54099bf86f6 diff --git a/qtdeclarative b/qtdeclarative index 3e20d105..5cb76fb3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3e20d1059a612ba5a6d3c049fe93f780f3ba3e58 +Subproject commit 5cb76fb3704947cfc4d575695b137460ecc8bbd9 diff --git a/qtdoc b/qtdoc index 6f5b2fae..f9cfb3d4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6f5b2fae0923aa495876aa073bdc4192d2bcba09 +Subproject commit f9cfb3d4f11203e50dc0b6516fbbcb2d16d8b585 diff --git a/qtgamepad b/qtgamepad index ffa5a03d..69dd73ad 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ffa5a03da503c3cd00f960debf3f43b85958c874 +Subproject commit 69dd73addc68b5d0dea986799a18d380de59a688 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 045174c4..ffd05a99 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 045174c411f89863165610c1f6135ef4bd3d0889 +Subproject commit ffd05a99843216878e61c2e2c11e317f3f9fdfae diff --git a/qtimageformats b/qtimageformats index 36fdeb50..e5c4a6f8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 36fdeb50941e3e2b0c4cd1b3343c3e337534357d +Subproject commit e5c4a6f82b83a1bf27380c071e822d5303642824 diff --git a/qtmacextras b/qtmacextras index c6d2605b..74ca0bd1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit c6d2605b07547a10c3400074307a2cdfb7be5167 +Subproject commit 74ca0bd1b317399fbab08ed71e46307f78c0b07c diff --git a/qtmultimedia b/qtmultimedia index fa8e1e71..732d9cb6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fa8e1e71bb17efe2549d9e81768f19c065065fce +Subproject commit 732d9cb6848a42f5a61b2b74dece962cdfba1d31 diff --git a/qtnetworkauth b/qtnetworkauth index d811ebc6..2634ca88 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d811ebc6c6e83b33d765664328da5c8c6f518f66 +Subproject commit 2634ca886f6f4dbacebae5f80641b46e06d86854 diff --git a/qtquickcontrols b/qtquickcontrols index b2922bae..1320f7f9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b2922baedd8b6a2aa1e6aa49a28e774e331c2be9 +Subproject commit 1320f7f9840e94db66988f2dce265dfd373add27 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1632be61..61cb7ca7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1632be617002a0d4a60b943bf9db66eaae4be4d7 +Subproject commit 61cb7ca7e8d8ebc5103870ae2795dbc65eb2c89f diff --git a/qtscript b/qtscript index 13f4c129..0bb3f301 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 13f4c129c2ba12956a6105bd57f407cc07708ca1 +Subproject commit 0bb3f3017f72cbf8d6866b8baa1820ab3dd89316 diff --git a/qtscxml b/qtscxml index 3ba41765..2143fd33 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3ba4176568867cb146c2b758cd39461367ad22d1 +Subproject commit 2143fd3362cc294c3076f879ef20c70ed3683f33 diff --git a/qtserialbus b/qtserialbus index a24e76d1..3e71f12d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a24e76d16ab3c3b18180e3dce554bc7696ea91c0 +Subproject commit 3e71f12de6995b2d9aa77b78f86251e49de8b2c5 diff --git a/qtspeech b/qtspeech index cb10801e..345d43ec 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cb10801ee7ea27d2296767ee24cbb048a7db5441 +Subproject commit 345d43ec7f349a2b71de784216d0a6fd6c42a0d0 diff --git a/qtsvg b/qtsvg index dc9e39eb..5f4e02ca 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit dc9e39eb679946e82bf3b1a82f5c49737f9994b2 +Subproject commit 5f4e02ca605f640beed9eebe74182814795e087e diff --git a/qttools b/qttools index 936ae1fd..7b775f51 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 936ae1fdd4634e7ace7ef0f1358185158adc9c59 +Subproject commit 7b775f51f574a4875be414e636d82c325810dd02 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 77fd5365..787721b7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 77fd536525883d62911a60055cced906e69af964 +Subproject commit 787721b75c9af2c235e0a88550fda638593a1a0e diff --git a/qtwebchannel b/qtwebchannel index ba755c28..07cbe313 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b +Subproject commit 07cbe31332c518993ad8fc5c519abf64a83d4ab9 diff --git a/qtwebengine b/qtwebengine index 30aa9c7b..ccf8ba23 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 30aa9c7bf0f1eceda8516fd5de87dc8e2cff1758 +Subproject commit ccf8ba23c27fdbbc5750e92310593749baf95ee9 diff --git a/qtwebsockets b/qtwebsockets index cd26439a..a99beb2c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit cd26439ac7ca1a444e9b5534a504afb0bb411890 +Subproject commit a99beb2c7b5867aac0e5ae997042cc88c0f6a175 diff --git a/qtwebview b/qtwebview index 7e71daf4..ff13c5b8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 7e71daf48c2ee3c3518cbfe6103d212772ccf414 +Subproject commit ff13c5b8576c3c8b6b376291466daab5e597509a diff --git a/qtwinextras b/qtwinextras index a56d14f9..ae198769 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a56d14f97c4b5aac1ab1cd3e95ce763452ea3e34 +Subproject commit ae1987696185f34482105ef3e542fc6c121d3614 diff --git a/qtx11extras b/qtx11extras index ec2c0f4d..071b8def 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ec2c0f4db6350a304dcf901b9adbadc895864c14 +Subproject commit 071b8def29e9b5af76f2f60a3f4569c746e5a39c diff --git a/qtxmlpatterns b/qtxmlpatterns index 9e26cfa1..40a50c0c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9e26cfa167778f3d9444aedcb23c8476683b3785 +Subproject commit 40a50c0c585eaa838261742e33a547e09d4040d6 From baa46f9590929bdd53a47648c943f56622bedf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 15 Sep 2017 16:06:28 +0300 Subject: [PATCH 032/101] Provisioning: fix .ci.local addresses to .intra.qt.io Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906 Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2015_update.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 | 2 +- coin/provisioning/common/3dstudio_3rdparty.ps1 | 2 +- coin/provisioning/common/ninja.ps1 | 2 +- coin/provisioning/common/python3.ps1 | 4 ++-- coin/provisioning/common/python3.sh | 2 +- coin/provisioning/common/ruby.ps1 | 2 +- coin/provisioning/common/vc_redist.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh | 2 +- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 index 556a352f..0c00ba71 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -36,7 +36,7 @@ # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 $version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" $sha1 = "a31e099e5114fef80a21654689e6864afc544a16" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index fb6a6594..2ad479c8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB $msvc_web_installer = "vs" + $version + "_" + $update_version $package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index 01442324..cf00ee88 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -36,7 +36,7 @@ # This script will install Visual Studio 2017 $version = "2017" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 index 556a352f..0c00ba71 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 @@ -36,7 +36,7 @@ # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 $version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" $sha1 = "a31e099e5114fef80a21654689e6864afc544a16" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index fb6a6594..2ad479c8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB $msvc_web_installer = "vs" + $version + "_" + $update_version $package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index 01442324..cf00ee88 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -36,7 +36,7 @@ # This script will install Visual Studio 2017 $version = "2017" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/3dstudio_3rdparty.ps1 index 36816438..f9c8faa7 100644 --- a/coin/provisioning/common/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/3dstudio_3rdparty.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty Remove-Item $zip diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/ninja.ps1 index 0d21f799..08bf2579 100644 --- a/coin/provisioning/common/ninja.ps1 +++ b/coin/provisioning/common/ninja.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip" -Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.ci.local\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip +Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2" Extract-Zip $zip C:\Utils\Ninja diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1 index 3c565874..316b567a 100644 --- a/coin/provisioning/common/python3.ps1 +++ b/coin/provisioning/common/python3.ps1 @@ -46,12 +46,12 @@ $install_path = "C:\Python36" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" } diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh index 56e82386..31591339 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/python3.sh @@ -38,7 +38,7 @@ source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" DestDir="/" diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 index 343bacfc..f7813c20 100644 --- a/coin/provisioning/common/ruby.ps1 +++ b/coin/provisioning/common/ruby.ps1 @@ -2,6 +2,6 @@ $installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" -Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer +Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" & $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 index 4213dde9..4a8376b6 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/vc_redist.ps1 @@ -43,13 +43,13 @@ if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $arch = "x64" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x64.exe" $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" } else { $arch = "x86" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x86.exe" $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1" } diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh index eca6858c..ef676ab3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/XZ.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" DestDir="/" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh index a9776ba6..743cc9da 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh @@ -49,7 +49,7 @@ ExceptionRemoveTmpFile=106 ExceptionDisableAutoUpdate=107 -url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg +url=http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg targetFile=/tmp/jdk-8u102-macosx-x64.dmg expectedSha1=1405af955f14e32aae187b5754a716307db22104 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index ea8613ad..6d57bfaa 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh index 54389916..ca21f481 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" appPrefix="" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh index e699933d..cb5c1852 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh @@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" psqlVersion="9.6.0" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" appPrefix="" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index 49ea0754..16b2f0c4 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" -basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" +basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-macosx.zip" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index a6563ae5..d109051d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.ci.local/input/openssl/$opensslFile" +opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh index dcd8fead..8a3999b9 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" DestDir="/" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 7555c752..37acc2ee 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -50,4 +50,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh index 4d938890..1e4de16a 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" appPrefix="" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh index 381fedf2..a990829e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" appPrefix="" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index cc00fe0d..3ffe1a06 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -37,7 +37,7 @@ $zip = "c:\users\qt\downloads\qnx700.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" Extract-7Zip $zip C:\ From 634d19610967feae48e410a04b2ecd1598f30572 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 1 Nov 2017 13:01:39 +0200 Subject: [PATCH 033/101] Provisioning: Refresh Subscription-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subscription manager needs to be refreshed so that RedHat repositories will stay available for provisioning scripts Change-Id: Idebc994fbefde951000570f6690c6849abfd3666 Reviewed-by: Tony Sarajärvi --- .../001-refresh-subscription-manager.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh new file mode 100755 index 00000000..a76a8638 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh @@ -0,0 +1,38 @@ +#!/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$ +## +############################################################################# + +# refresh local certificates +sudo subscription-manager refresh + From 03d6b7b36a95fe171ab6e873a5b1d1e1629a2977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 1 Nov 2017 09:32:50 +0200 Subject: [PATCH 034/101] Fix Windows 8 libclang script locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently for some reason there exist both "windows-8" and "windows-8.1" folders in coin/provisioning/. "windows-8" folders contain only the libclang provisioning scripts. These should be under "windows-8.1" since "windows-8" shouldn't exist anymore. Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267 Reviewed-by: Heikki Halmet Reviewed-by: Simo Fält --- .../{qtci-windows-8-x86 => qtci-windows-8.1-x86}/08-libclang.ps1 | 0 .../08-libclang.ps1 | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/{qtci-windows-8-x86 => qtci-windows-8.1-x86}/08-libclang.ps1 (100%) rename coin/provisioning/{qtci-windows-8-x86_64 => qtci-windows-8.1-x86_64}/08-libclang.ps1 (100%) diff --git a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 From 6275ed9d70b840bb945e58338398c0c48f57d08c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 31 Oct 2017 10:17:49 +0200 Subject: [PATCH 035/101] Provisioning: Fix p7zip installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c Reviewed-by: Tony Sarajärvi Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh index d21fab6c..966f3045 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh @@ -32,11 +32,24 @@ ## $QT_END_LICENSE$ ## ############################################################################# +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -sudo wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm -sudo rpm -ivh epel-release-7-10.noarch.rpm -sudo yum -y install p7zip -sudo rm epel-release-7-10.noarch.rpm +name="p7zip" +version="7-11" +package="epel-release-$version.noarch.rpm" +primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" +cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" +sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +targetFile="/tmp/$package" + +DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" + +sudo rpm -ivh "$targetFile" +sudo yum -y install "$name" +sudo rm "$targetFile" # Link 7za to 7z so we can use existing installation scripts sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt + From 4a4589d8785867d725dd6b358500589af0ae0faa Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Tue, 24 Oct 2017 16:38:21 +0200 Subject: [PATCH 036/101] Don't recommend QtWebView in QtNetworkAuth module QtWebView is not used in QtNetworkAuth. There is no need to recommend the QtWebView module. Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae Reviewed-by: Kevin Funk Reviewed-by: Oswald Buddenhagen --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4cc5b93a..3d8128eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -298,7 +298,6 @@ status = addon [submodule "qtnetworkauth"] depends = qtbase - recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git branch = 5.10 From 0aecf8a1df641b8ce043ac198688f132f6f633f2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 5 Nov 2017 00:49:36 +0100 Subject: [PATCH 037/101] Update qtwebengine only Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index ccf8ba23..721ca2f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ccf8ba23c27fdbbc5750e92310593749baf95ee9 +Subproject commit 721ca2f0ed86002865518f74175ce88a04ea033b From f132490a618759e01e8d6bbbe108fb41bf9de277 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 5 Nov 2017 21:35:20 +0200 Subject: [PATCH 038/101] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I07353da970e5939cfba760c23b11d74d2de02a9c Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 9f0dda29..b5b1e103 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9f0dda29d5d070f63b7f098139f01f07ec91ffdf +Subproject commit b5b1e1036ff59b584719b8af7b3be8223a662233 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..87999238 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 742e869afe2dbba6aae6302d20ba9c82f3ed99c6 +Subproject commit 87999238141588987b3cef6cd68ff62a7e3e8daa diff --git a/qtdoc b/qtdoc index 07446998..053aea2e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 07446998a4d75ceb6376dd674b9e9426b170ae6b +Subproject commit 053aea2e785df6361d86a5eb912d3ea25f72ee17 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..6470a54e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1d39e62ada99d85a411e1d6fc26925e342f5b59b +Subproject commit 6470a54ed34523822c50ac846a17a9f76564cf58 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..d6838615 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 779002b14dc2e9e4eb22f2c2c243f3da12fa4c72 +Subproject commit d683861584a38a1d1b855bde25412c06c878a1c1 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 49eabec1..19cae9dd 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 49eabec1a99b3b2a1db05cb46d5402015391cedb +Subproject commit 19cae9ddecbff856e5ff0e294402091db0c2484b From e3deccd936278e365e6dc94059e18ed03ed53bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 26 Sep 2017 15:04:23 +0300 Subject: [PATCH 039/101] Yocto toolchain provisioning to CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Provisioning scripts need to install Yocto toolchains (32 and 64 bit) so that the artifacts aren't needed to be unzipped during Qt builds. Task-number: QTQAINFRA-1454 Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 3 +- coin/platform_configs/qtdeclarative.txt | 3 +- .../003-qemu.sh | 10 ++- .../004-yocto.sh | 89 +++++++++++++++++++ 4 files changed, 101 insertions(+), 4 deletions(-) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 672b22a2..06a17b54 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,7 @@ qtci-osx-10.11-x86_64-3 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 2a9d9ac7..3139af8b 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index 20fb83ad..62366933 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -43,7 +43,7 @@ cd "$tempDir" #latest commit from the master proven to work git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f git submodule update --init pixman -./configure --target-list=arm-linux-user --static +./configure --target-list=arm-linux-user,aarch64-linux-user --static make sudo make install rm -rf "$tempDir" @@ -51,13 +51,19 @@ rm -rf "$tempDir" # Enable binfmt support sudo apt-get -y install binfmt-support -# Install qemu binfmt +# Install qemu binfmt for 32bit and 64bit arm architectures sudo update-binfmts --package qemu-arm --install arm \ /usr/local/bin/qemu-arm \ --magic \ "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ --mask \ "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" +sudo update-binfmts --package qemu-aarch64 --install aarch64 \ +/usr/local/bin/qemu-aarch64 \ +--magic \ +"\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ +--mask \ +"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" # First test using QFont fails if fonts-noto-cjk is installed. This happens because # running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh new file mode 100755 index 00000000..050f4aba --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh @@ -0,0 +1,89 @@ +#!/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$ +## +############################################################################# + +# This script installs the Yocto toolchain + +set -e + +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + +echo "Installing Yocto toolchain for 32-bit b2qt..." + +versionARM="2.2.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" +SHA1="2583ae29951954cb27f12400fcb4ee94738d1430" +yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" +yoctoLocationARMv7="/opt/yocto-armv7" +sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" +crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" +rm -rf "$yoctoInstaller" + +echo "Installing Yocto toolchain for 64-bit b2qt..." + +versionARM64="2.2.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" +SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6" +yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" +yoctoLocationARM64="/opt/yocto-arm64" +sysrootARM64="sysroots/aarch64-poky-linux" +crosscompileARM64="sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" +rm -rf "$yoctoInstaller" + +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then + echo "export QEMUARMV7_TOOLCHAIN_SYSROOT=$yoctoLocationARMv7/$sysrootARMv7" >> ~/.profile + echo "export QEMUARMV7_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARMv7/$crosscompileARMv7" >> ~/.profile + echo "export QEMUARM64_TOOLCHAIN_SYSROOT=$yoctoLocationARM64/$sysrootARM64" >> ~/.profile + echo "export QEMUARM64_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARM64/$crosscompileARM64" >> ~/.profile +else + echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 + exit 1 +fi + +echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt +echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt From f1a9b684bf72282204987b3ed33922e36d693884 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 6 Nov 2017 21:51:51 +0200 Subject: [PATCH 040/101] Update submodules on '5.10' in qt5 Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index ced895b3..aad54453 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ced895b361e4fff97f1b2d21e7f1bb33c82f34cd +Subproject commit aad54453595e7fe857b1ab3db5b72b40bef2700a diff --git a/qtbase b/qtbase index ea0e868c..3e5dde47 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ea0e868c4881944207e9b3a77011e05a505ff3b7 +Subproject commit 3e5dde4766780665c1030003e3af3aefb75c5dbf diff --git a/qtcharts b/qtcharts index dad8cdba..93ac0acb 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit dad8cdbac13eaf3ed33fdf4157ebc242d5c13db5 +Subproject commit 93ac0acba1baa63a4709e623a7790349df41c299 diff --git a/qtconnectivity b/qtconnectivity index 0d2f4356..6efa28f0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0d2f435672288d1084bfb6156503b6a5afe54827 +Subproject commit 6efa28f0c193adf0151bb78d9660fa1fe6e8c525 diff --git a/qtdatavis3d b/qtdatavis3d index ee68813c..190687f6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit ee68813c81d5c3d40af6d362f851d54099bf86f6 +Subproject commit 190687f649bae0cb954652637255042f716fd110 diff --git a/qtdeclarative b/qtdeclarative index 5cb76fb3..853b4b08 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5cb76fb3704947cfc4d575695b137460ecc8bbd9 +Subproject commit 853b4b08d54f70d04d371d707e50760ffecf2f77 diff --git a/qtlocation b/qtlocation index d340bf2b..0cecbf08 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d340bf2be1738f3d47bc455ea122aef9a9e1c11d +Subproject commit 0cecbf084f805ddfd114370b2d8f5a107602971d diff --git a/qtmultimedia b/qtmultimedia index 732d9cb6..a383e038 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 732d9cb6848a42f5a61b2b74dece962cdfba1d31 +Subproject commit a383e038116654cebb3105554dfff8915b0b3f70 diff --git a/qtpurchasing b/qtpurchasing index f9378f6f..525751ea 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f9378f6f03e8f565e2d080b339ed8d68d22054a0 +Subproject commit 525751ea4f24b8e3e2fa37beed47c391926d4319 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 61cb7ca7..442843db 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 61cb7ca7e8d8ebc5103870ae2795dbc65eb2c89f +Subproject commit 442843db6f5dce6b594448d43b380c9b884a7c91 diff --git a/qtremoteobjects b/qtremoteobjects index 4f86dbe5..fee86745 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4f86dbe54d493cf33c1121e88dd7f64ab678343a +Subproject commit fee8674500d829898a4347e2ea77690e04b11b22 diff --git a/qtsensors b/qtsensors index b2e6b77c..fc60f538 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a +Subproject commit fc60f53817d3182c545cef15e3ab94a85ef01379 diff --git a/qtserialport b/qtserialport index 3e0d23ff..c48e84e9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3e0d23ff3533fd11e0f5b680e1943e457468310c +Subproject commit c48e84e97ec5bf03ffc85625fe884042aa6b2e26 diff --git a/qtsvg b/qtsvg index 5f4e02ca..f1ba9514 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5f4e02ca605f640beed9eebe74182814795e087e +Subproject commit f1ba95141c54b452edd737e9adb3461f303eb850 diff --git a/qttools b/qttools index 7b775f51..4e612c7d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7b775f51f574a4875be414e636d82c325810dd02 +Subproject commit 4e612c7d3dbfebfaf3eac346aa5261760871a799 diff --git a/qttranslations b/qttranslations index 3100d230..c24bb936 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3100d230a1dc8b42dffaab9c17161fb5129109d5 +Subproject commit c24bb936786b8da06db998a1ba2193ce3460d5b1 diff --git a/qtwayland b/qtwayland index 523cf490..3ae8e08d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 523cf490b4c46916c6f5253c666a492f5cce2aad +Subproject commit 3ae8e08df33e017f5be91b68118093776c46788c diff --git a/qtwebglplugin b/qtwebglplugin index 7c8a89c1..c82c3103 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 7c8a89c11e13c6bbd7a81ee391670a361eaf6061 +Subproject commit c82c3103f3e875d7d5f79dc3c4b273e9644e4ded diff --git a/qtwebsockets b/qtwebsockets index a99beb2c..7e853bcd 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a99beb2c7b5867aac0e5ae997042cc88c0f6a175 +Subproject commit 7e853bcd05cbc955b71843586ee20158e6ed3091 From 894c63834baf28c78c87e39d25bc8940d4e35cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 7 Nov 2017 09:11:53 +0200 Subject: [PATCH 041/101] Fix spelling of ANDROID_SDK_HOME It was incorrectly created at ANDROID_SDK_ROOT, but Coin doesn't use that env variable. It uses _HOME. Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index 16b2f0c4..e041027d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -79,7 +79,7 @@ try echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager - echo "export ANDROID_SDK_ROOT=$sdkTargetFolder" >> ~/.bashrc + echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc From 0e278c4e95aa5d2e9df315125c119f36149fcc95 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 3 Nov 2017 13:09:55 +0200 Subject: [PATCH 042/101] Provisioning: Remove logical OR when echo errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit set -e won't work if logical OR is used after commands. These error echo's need to be removed so that error catch will works. Also set -ex added to print executed command when error caught. Task-number: QTQAINFRA-1533 Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/qnx_700.sh | 8 ++++---- .../android_linux.sh | 12 +++++------ .../qtci-linux-RHEL-6.6-x86_64/install_icu.sh | 12 +++++------ .../qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 12 +++++------ .../009-install_icu.sh | 20 +++++++++---------- .../003-qemu.sh | 4 ++-- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh index 0b17a7a0..1f1c0f3f 100644 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -35,18 +35,18 @@ # This script installs QNX 7. -set -e +set -ex targetFolder="/opt/" sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" folderName="qnx700" targetFile="qnx700.tar.xz" -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times" -echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" +wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" +echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile" +sudo tar -C $targetFolder -Jxf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" # Verify that we have last file in tar diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index fb8679f2..69b3c10e 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -43,7 +43,7 @@ # E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. # That's why we need to use Andoid-21 API version in Qt 5.9. -set -e +set -ex targetFolder="/opt/android" baseUrl="http://ci-files01-hki.intra.qt.io/input/android" @@ -78,8 +78,8 @@ function InstallAndroidPackage { folderName=$7 name=$8 - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" - echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" + echo "$sha1 $targetFile" | sha1sum --check sudo chmod 755 "$targetFile" sudo $extract || echo "Failed to extract $url" sudo chown -R qt:users "$targetFolder"/"$folderName" @@ -89,10 +89,10 @@ function InstallAndroidPackage { if [ -d "$targetFolder" ]; then echo "Removing old Android installation" - sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) + sudo rm -fr "$targetFolder" fi -sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) +sudo mkdir "$targetFolder" # Install Android SDK echo "Installing Android SDK version $sdkPackage..." @@ -104,7 +104,7 @@ InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFil # run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" +echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh index 42db3716..03a69edb 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh @@ -35,7 +35,7 @@ # This script installs the right ICU version -set -e +set -ex icuVersion="56.1" icuLocation="/usr/lib64" sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" @@ -45,10 +45,10 @@ function Install7ZPackageFromURL { expectedSha1=$2 targetDirectory=$3 - targetFile=`mktemp` || echo "Failed to create temporary file" - wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" - echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive" + targetFile=`mktemp` + wget --tries=5 --waitretry=5 --output-document=$targetFile $url + echo "$expectedSha1 $targetFile" | sha1sum --check + sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile rm $targetFile } @@ -61,7 +61,7 @@ echo "Installing custom ICU devel packages on RHEL" sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" -tempDir=`mktemp -d` || echo "Failed to create temporary directory" +tempDir=`mktemp -d` trap "sudo rm -fr $tempDir" EXIT Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir sudo cp -a $tempDir/lib/* /usr/lib64 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index ad5c90d3..27c7137b 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -39,7 +39,7 @@ # A copy of the patch must be in the root of the Coin path in # provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -set -e +set -ex sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" function InstallZipPackageFromURL { @@ -47,12 +47,12 @@ function InstallZipPackageFromURL { expectedSha1=$2 targetDirectory=$3 - targetFile=`mktemp` || echo "Failed to create temporary file" - wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" - echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + targetFile=`mktemp` + wget --tries=5 --waitretry=5 --output-document=$targetFile $url + echo "$expectedSha1 $targetFile" | sha1sum --check - tempDir=`mktemp -d` || echo "Failed to create temporary directory" - /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive" + tempDir=`mktemp -d` + /usr/bin/unzip -o -d $tempDir $targetFile trap "sudo rm -fr $targetFile $tempDir" EXIT sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh index b51c9c8c..9447c43f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex # This script will install ICU @@ -47,20 +47,20 @@ develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" -targetFile=`mktemp` || echo "Failed to create temporary file" -wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL || echo "Failed to download '$baseBinaryPackageURL' multiple times" -echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" -sudo 7z x -y -o"/usr/lib64" $targetFile || echo "Failed to unzip $baseBinaryPackageURL archive" +targetFile=`mktemp` +wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL +echo "$sha1 $targetFile" | sha1sum --check +sudo 7z x -y -o"/usr/lib64" $targetFile sudo rm $targetFile echo "Installing custom ICU devel packages on RHEL" -tempDir=`mktemp -d` || echo "Failed to create temporary directory" +tempDir=`mktemp -d` -targetFile=`mktemp` || echo "Failed to create temporary file" -wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL || echo "Failed to download '$develPackageURL' multiple times" -echo "$sha1Dev $targetFile" | sha1sum --check || echo "Failed to check sha1sum" -7z x -y -o$tempDir $targetFile || echo "Failed to unzip $develPackageURL archive" +targetFile=`mktemp` +wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL +echo "$sha1Dev $targetFile" | sha1sum --check +7z x -y -o$tempDir $targetFile sudo cp -a $tempDir/lib/* /usr/lib64 sudo cp -a $tempDir/* /usr/ diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index 62366933..74ef2b4e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -32,11 +32,11 @@ ## ############################################################################# -set -e +set -ex # build latest qemu to usermode sudo apt-get -y install automake autoconf libtool -tempDir=$(mktemp -d) || echo "Failed to create temporary directory" +tempDir=$(mktemp -d) git clone git://git.qemu.org/qemu.git "$tempDir" cd "$tempDir" From 94ce4209567a5d4b614b932f09b43dd5286563b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 7 Nov 2017 16:58:57 +0100 Subject: [PATCH 043/101] 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 044/101] 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 207494b1d32ec331383d08e6f490cd0b4cfcb82e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 Nov 2017 10:59:56 +0100 Subject: [PATCH 045/101] Update submodules on '5.9' in qt5 Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 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/qtbase b/qtbase index b5b1e103..31cc29e9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b5b1e1036ff59b584719b8af7b3be8223a662233 +Subproject commit 31cc29e9be22a5c09cb90d004d967d524a02408f diff --git a/qtdeclarative b/qtdeclarative index 87999238..54f15f5d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 87999238141588987b3cef6cd68ff62a7e3e8daa +Subproject commit 54f15f5df5cf545bf4d675ccbafecd482b4a2b0b diff --git a/qtdoc b/qtdoc index 053aea2e..e4ccd4a7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 053aea2e785df6361d86a5eb912d3ea25f72ee17 +Subproject commit e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6470a54e..f46776cc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6470a54ed34523822c50ac846a17a9f76564cf58 +Subproject commit f46776cc68f88a8cbc518cacf6c63f31f11d73b0 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/qttools b/qttools index d6838615..9df14033 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d683861584a38a1d1b855bde25412c06c878a1c1 +Subproject commit 9df140339230d92690758ebc3e3b6cc6c1a5e8e3 diff --git a/qtwayland b/qtwayland index f1407493..bfd08f5e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f1407493d6d25f24a3c71fbcedc00598baa44b56 +Subproject commit bfd08f5ebd33e452c08595e5811698a16d3166fa diff --git a/qtwebengine b/qtwebengine index 399d77a3..e9309d91 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 399d77a38ff52d33dc871a5b221db253308b7436 +Subproject commit e9309d91ac3ec0ddd7076b5cf66655380aa82cac From 537ea17d14526bc6564765e2dd4652e11a3ed235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 2 Nov 2017 11:16:42 +0200 Subject: [PATCH 046/101] Fix Ubuntu 16.04 random provisioning fail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu 16.04 provisioning sometimes fails in the apt-get commands for package installations. This is caused by a lock that is still in use when the system is calling the apt-get commands. This change will use the apt daemon to queue the install commands and wait for the lock to release instead of checking once and then failing if the lock is not open. Task-number: QTQAINFRA-1502 Change-Id: Idd4aff42f99cf4d14c08aef8fcc3cb7dbc58b2dd Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index f07be55a..f47875a3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -50,40 +50,40 @@ try echo "Installing packages" # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libssl-dev || throw $ExceptionAPT # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT # Enable linking to system dbus - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libdbus-1-dev || throw $ExceptionAPT # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT # Common event loop handling - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libfreetype6-dev || throw $ExceptionAPT # Enable the usage of system jpeg libraries - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libcups2-dev || throw $ExceptionAPT # Install libraries needed for QtMultimedia to be able to support all plugins - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT # python3 development package - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in @@ -101,4 +101,3 @@ catch || { ;; esac } - From ada909932df1690c077d4c19e5aa5564c6d4a883 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 9 Oct 2017 11:42:37 +0300 Subject: [PATCH 047/101] Provisioning: Update Java to version 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current version of Java isn't installing correctly during provisioning. Silent installation needs parameters which are added to script. Without those the installation process tries to open Java3BillDevices.jpg unsuccessfully and the installation fails Task-number: QTQAINFRA-1498 Task-number: QTQAINFRA-1394 Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-java.ps1 | 62 ------------------- .../08-install-java.ps1 | 1 - .../qtci-windows-10-x86_64/08-install-jdk.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-java.ps1 | 1 - .../qtci-windows-8.1-x86/08-install-jdk.ps1 | 1 + .../08-install-java.ps1 | 1 - .../08-install-jdk.ps1 | 1 + 7 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 coin/provisioning/common/install-java.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 deleted file mode 100644 index 50f12c89..00000000 --- a/coin/provisioning/common/install-java.ps1 +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Java RE -# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. - -$installdir = "C:\Program Files\Java\jre7" - -$version = "7u7" -if( (is64bitWinHost) -eq 1 ) { - $arch = "x64" - $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" -} -else { - $arch = "i586" - $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" -} - -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe" -$javaPackage = "C:\Windows\Temp\java-$version.exe" - -Copy-Item $url_cache $javaPackage -cmd /c "$javaPackage /s SPONSORS=0" -echo "Cleaning $javaPackage.." -Remove-Item -Recurse -Force "$javaPackage" - -[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) -Add-Path "$installdir\bin" - -echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" From 60fb3cb2727ede0d8f6e5dd8cbc148b24408ed01 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 8 Nov 2017 12:19:51 +0200 Subject: [PATCH 048/101] Provisioning: Install signing tools to MacOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install needed certificates and signing tools which are needed when signing release packages Change-Id: I21b9c3d1a6b4c83dec6b8ae1674def4ecc02f444 Reviewed-by: Tony Sarajärvi --- .../qtci-macos-10.12-x86_64/555-signtools.sh | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh new file mode 100755 index 00000000..49e087a8 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh @@ -0,0 +1,138 @@ +#!/bin/sh + +############################################################################# +## +## 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$ +## +############################################################################# + +# Install tools for singing packages +# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. + +set -ex + +cache="http://ci-files01-hki.intra.qt.io/input" +cacheSigningTools="$cache/mac/sign_tools" +targetFolder="/Users/qt" +keychains="$targetFolder/Library/Keychains" + +Install() { + + url=$1 + targetFile=$2 + expectedSha1=$3 + + echo "Fetching $targetFile from $url..." + curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" + shasum "$targetFile" |grep "$expectedSha1" + +} + +# qt-license +sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" +Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense + +# Login keychain +sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" +loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +loginKeychain=$keychains/login.keychain + +echo "Setting login.keychain as default keychain.." +security default-keychain -s $loginKeychain* +echo "Unlocking Login keychain with password.." +security unlock-keychain -p "$loginKeychainPassword" $loginKeychain* + +echo "remove the "Lock after X minutes of inactivity" from login.keychain" +security set-keychain-settings $loginKeychain + +# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer +sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" +Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" + +# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer +sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" +Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" + +# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' +sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" +unlockKeychain=$targetFolder/unlock-keychain.sh +Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain +sudo chmod 755 "$unlockKeychain" + +# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. +shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" +csreq=$targetFolder/csreq_qt_company.txt +Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq +chmod 755 "$csreq" + +# iOS signing tools +devIDKeychain="Developer_ID_TheQtCompany.keychain" +shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca" +Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain +echo "Opening $devIDKeychain.." +open "$keychains/$devIDKeychain" + +sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" +Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" +DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") + +echo "Unlocking $devIDKeychain with password.." +security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain +security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain + +sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios +iosPassword=$(<"$targetFolder/ios_password.txt") + +iPhoneDeveloper="iosdevelopment.p12" +shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +echo "Importing $iPhoneDeveloper.." +security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign + +iPhoneDistribution="iosdistribution.p12" +shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +echo "Importing $iPhoneDistribution.." +security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign + +# Mobileprovision +echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." +mkdir "$targetFolder/Library/MobileDevice" +mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" +shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" +Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision + +# Removing password files +rm -fr "$targetFolder/login_keychain_password.txt" + From 3653630d229390c9ce5517afcce371860d2ad822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Fri, 10 Nov 2017 12:33:05 +0100 Subject: [PATCH 049/101] Provisioning: Disable NTP synchronization for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During CI, it has been observed that some processes didn't leave their wait state. (So they were "hanging") During analysis of the event log on that CI node, we found out that at the same time those processes entered this state, the NTP client set a new time and indeed the local time of the CI node changed (it was changed 2 hours forward in our case). For the record, the processes we observed this with was jom.exe and cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)). We therefore have a strong suspicion that the NTP time change was causing the CI hang, so we simply disable it. The virtual machine should anyway get the correct time from its VM host when its started. Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/disable-ntp.ps1 | 2 ++ coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 | 1 + 8 files changed, 9 insertions(+) create mode 100644 coin/provisioning/common/disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/disable-ntp.ps1 new file mode 100644 index 00000000..4ec9d1bd --- /dev/null +++ b/coin/provisioning/common/disable-ntp.ps1 @@ -0,0 +1,2 @@ +# Disable the NTP from syncing +w32tm /config /syncfromflags:NO diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" From a8bd91bc277de146979372831347cede8e60b280 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 10 Nov 2017 12:50:41 +0200 Subject: [PATCH 050/101] 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 051/101] 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 d56552566fc61bd2a659b2a3538bd555d435ae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Sep 2017 13:47:45 +0300 Subject: [PATCH 052/101] Provisioning: FBX SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to provision the FBX SDK for Qt3DStudio. Task-number: QTQAINFRA-1449 Change-Id: I52587cd653b7954340d5f58978ffbd008330337c Reviewed-by: Marianne Yrjänä Reviewed-by: Miikka Heikkinen Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/fbx_linux.sh | 62 +++++++++++++++ coin/provisioning/common/fbx_macos.sh | 79 +++++++++++++++++++ coin/provisioning/common/fbx_windows.ps1 | 68 ++++++++++++++++ .../qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh | 4 + .../qtci-macos-10.12-x86_64/030-fbx.sh | 5 ++ .../qtci-windows-10-x86_64/030-fbx.ps1 | 1 + 6 files changed, 219 insertions(+) create mode 100755 coin/provisioning/common/fbx_linux.sh create mode 100755 coin/provisioning/common/fbx_macos.sh create mode 100644 coin/provisioning/common/fbx_windows.ps1 create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh new file mode 100755 index 00000000..66d4793b --- /dev/null +++ b/coin/provisioning/common/fbx_linux.sh @@ -0,0 +1,62 @@ +#!/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$ +## +############################################################################# + +# This script installs FBX SDK +source "${BASH_SOURCE%/*}/DownloadURL.sh" +#s script installs FBX SDK + +set -e +tarballName="fbx20161_2_fbxsdk_linux.tar.gz" +targetFolder="/opt/fbx" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName" +sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605" +tmpFolder="/tmp" +targetFile="$tmpFolder/$tarballName" +installer="$tmpFolder/fbx20161_2_fbxsdk_linux" + +DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile" + +sudo tar -C $tmpFolder -xf "$targetFile" +sudo mkdir -p $targetFolder +(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder" + +rm -rf "$targetFile" + +# Set env variables +echo "export FBXSDK=$targetFolder" >> ~/.profile + +echo "FBX SDK = 2016.1.2" >> ~/versions.txt + diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh new file mode 100755 index 00000000..66a2d998 --- /dev/null +++ b/coin/provisioning/common/fbx_macos.sh @@ -0,0 +1,79 @@ +#!/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$ +## +############################################################################# + +# This script installs FBX SDK + +# shellcheck source=./try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" +targetFolder="/opt/fbx" +cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName" +sha1="f82535423c700c605320c52e13e781c92208ec6b" +targetFolder="/tmp" +targetFile="$targetFolder/$fileName" +installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg" + +ExceptionExtractPrimaryUrl=100 + +try +( + echo "Extracting '$cachedUrl'" + tar -xzf "$cachedUrl" -C "$targetFolder" || throw $ExceptionExtractPrimaryUrl +) +catch || { + case $ex_code in + $ExceptionExtractPrimaryUrl) + set -e + echo "Failed to uncompress from '$cachedUrl'" + echo "Downloading from '$officialUrl'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" || exit 1; + echo "Checking SHA1 on PKG '$targetFile'" + echo "$sha1 *$targetFile" > $targetFile.sha1 + shasum --check $targetFile.sha1 + echo "Extracting '$targetFile'" + tar -xzf "$targetFile" -C "$targetFolder" || exit 1; + ;; + esac +} +set -e +rm -rf "$targetFile" +echo "Running installer for '$installer'" +sudo installer -pkg "$installer" -target "/" + +# Set env variables +echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc +echo "FBX SDK = 2016.1.2" >> ~/versions.txt + diff --git a/coin/provisioning/common/fbx_windows.ps1 b/coin/provisioning/common/fbx_windows.ps1 new file mode 100644 index 00000000..00de579d --- /dev/null +++ b/coin/provisioning/common/fbx_windows.ps1 @@ -0,0 +1,68 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install FBX SDK + +$version = "2016.1.2" + +$name = "fbx20161_2_fbxsdk_vs2015_win" +$packageName = "$name.7z" +$installerName = "$name.exe" +$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName" +$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24" + +# The executable is an interactive installer only. We can't run it in a script silently. +# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName" +# This sha is for the executable +# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e" + +#$targetFile = "C:\Windows\Temp\$packageName" +$targetFolder = "C:\Program Files\" + +#echo "Downloading '$installerName'" +#Download $officialUrl $cacheUrl $targetFile +#Verify-Checksum $targetFile $sha1 + +echo "Extracting '$cacheUrl'" +#Extract-7Zip $cacheUrl $targetFolder +Start-Process -FilePath "C:\Utils\sevenzip\7z.exe" -ArgumentList "x -y `"$cacheUrl`" -o`"$targetFolder`"" -Wait + +#Remove-Item -Recurse -Force "$packageName" + +echo "Adding environment variables." +[Environment]::SetEnvironmentVariable("FBXSDK", "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2", [EnvironmentVariableTarget]::Machine) + +echo "FBX SDK = $version" >> ~\versions.txt + diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh new file mode 100755 index 00000000..7c5fadcb --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_linux.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh new file mode 100644 index 00000000..50c6796b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_macos.sh + diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 new file mode 100644 index 00000000..82cee080 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\fbx_windows.ps1" From 63092430647884f031c94c743b34638aefc0ee7b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 9 Nov 2017 09:03:16 +0200 Subject: [PATCH 053/101] Provisioning: Install expect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expect is needed by Release Test Automation (RTA) to automate configure testing. Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517 Reviewed-by: Joni Jäntti Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index f47875a3..9b71f935 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -84,6 +84,8 @@ try yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT # python3 development package yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT + # Automates interactive applications (Needed by RTA to automate configure testing) + yes | sudo aptdcon --hide-terminal --install expect || throw $ExceptionAPT ) catch || { case $ex_code in From 841cf6893aa7c9d93f68177ec921af6edd13c7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 10 Nov 2017 14:35:15 +0200 Subject: [PATCH 054/101] Make QtWebKit builds use vanilla Win 10 x64 template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWebKit build targets are currently using the old non-vanilla template for Windows 10 x64. Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69 Reviewed-by: Liang Qi Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtwebkit.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 521191bb..b3dc74f7 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From c016a01b4c74c7668be4c467ef63f89088c31126 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 10 Nov 2017 16:43:10 +0300 Subject: [PATCH 055/101] Conan: fix names of ICU dll's which are added to qtwebkit binary package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86/conanfiles/qtwebkit.txt | 6 +++--- .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin From f84bab04f7698e924cde88385c8a6f92e77b1297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 13 Nov 2017 13:40:42 +0200 Subject: [PATCH 056/101] Remove unneeded provisioning scripts Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283 Reviewed-by: Heikki Halmet --- .../common/01-macos-removethemall.sh | 49 ------------------- .../01-macos-removethemall.sh | 4 -- .../qtci-osx-10.10-x86_64/crashreporter.sh | 2 - 3 files changed, 55 deletions(-) delete mode 100644 coin/provisioning/common/01-macos-removethemall.sh delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/01-macos-removethemall.sh deleted file mode 100644 index f0e26480..00000000 --- a/coin/provisioning/common/01-macos-removethemall.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -function RemoveDir { - param=$1 - - if [ ! -d $param ] - then - echo "'$param' don't exists" - else - echo "Removing $param..." - sudo rm -fr $param - fi -} - -# Remove Android -param="/opt/android" -RemoveDir $param diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh deleted file mode 100644 index 6b56aac4..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -source "$BASEDIR/../common/01-macos-removethemall.sh" - diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh deleted file mode 100644 index ba8dbdd3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -defaults write com.apple.CrashReporter DialogType server From 329d718a1910f7b8e53b9d2feea2dc7a64b54adb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 Nov 2017 19:37:08 +0200 Subject: [PATCH 057/101] Update submodules on '5.9' in qt5 Change-Id: I35e62f9e2869d95d2432e369dc69f57262925741 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 31cc29e9..25b18fb2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 31cc29e9be22a5c09cb90d004d967d524a02408f +Subproject commit 25b18fb241315ed314b6b67f4b97028e2a1e484a diff --git a/qtdeclarative b/qtdeclarative index 54f15f5d..6990ae6c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 54f15f5df5cf545bf4d675ccbafecd482b4a2b0b +Subproject commit 6990ae6c1bad32952e371fa72bee65a7af11c313 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/qtmultimedia b/qtmultimedia index c3c6b7d0..4a214b19 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c3c6b7d0987b90e4a987ee84b2f31adf06568a0d +Subproject commit 4a214b199337a02e8cab77aa0cdca0c2805fb6a2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f46776cc..a0559ea8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f46776cc68f88a8cbc518cacf6c63f31f11d73b0 +Subproject commit a0559ea88be32e19e83b2131cb26e61e873dc817 diff --git a/qtscxml b/qtscxml index 113b502b..3d238184 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 113b502b194d6d7573b9f86f400bdf481e98cf74 +Subproject commit 3d23818472e371745f4ad4bd4b6c92de3d119e34 diff --git a/qttools b/qttools index 9df14033..4c2cae79 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9df140339230d92690758ebc3e3b6cc6c1a5e8e3 +Subproject commit 4c2cae795117897847c0ba0e9b9ff20fa6e4eda9 diff --git a/qtwebengine b/qtwebengine index e9309d91..d53efba0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e9309d91ac3ec0ddd7076b5cf66655380aa82cac +Subproject commit d53efba0b69e883ce70fa834856dcef61976725a 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 058/101] 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 059/101] 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 060/101] 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 26fda37639ce3c062eba550c9d87dc367b2b1c0c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 16 Nov 2017 09:49:29 +0100 Subject: [PATCH 061/101] Update submodules on '5.10' in qt5 Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtxmlpatterns | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qt3d b/qt3d index aad54453..100cc447 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit aad54453595e7fe857b1ab3db5b72b40bef2700a +Subproject commit 100cc447253e84a3dc7df2a140731d7c85863780 diff --git a/qtbase b/qtbase index 3e5dde47..c8a5f331 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e5dde4766780665c1030003e3af3aefb75c5dbf +Subproject commit c8a5f331c8fdbf243ccb467f7bc3c9f62bd47c9f diff --git a/qtconnectivity b/qtconnectivity index 6efa28f0..5a382311 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6efa28f0c193adf0151bb78d9660fa1fe6e8c525 +Subproject commit 5a38231103159346c976a620c01fba37eea85d92 diff --git a/qtdeclarative b/qtdeclarative index 853b4b08..131a7e3a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 853b4b08d54f70d04d371d707e50760ffecf2f77 +Subproject commit 131a7e3a544a90035dcab5e1aa6aff509395e155 diff --git a/qtdoc b/qtdoc index f9cfb3d4..08bd2bd9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f9cfb3d4f11203e50dc0b6516fbbcb2d16d8b585 +Subproject commit 08bd2bd92c1ce9694d1182609c131747eed7165f diff --git a/qtlocation b/qtlocation index 0cecbf08..afc51951 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0cecbf084f805ddfd114370b2d8f5a107602971d +Subproject commit afc51951769ac7320a98a973bcb95a12bc970019 diff --git a/qtmultimedia b/qtmultimedia index a383e038..5af70385 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a383e038116654cebb3105554dfff8915b0b3f70 +Subproject commit 5af70385a0b1a04e10d088f655ee33338ec014c5 diff --git a/qtnetworkauth b/qtnetworkauth index 2634ca88..69512ab9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2634ca886f6f4dbacebae5f80641b46e06d86854 +Subproject commit 69512ab9b27eb8615a78d12aa99752df70127c69 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..aa081a76 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1320f7f9840e94db66988f2dce265dfd373add27 +Subproject commit aa081a76fe19fd606469c53a829c6f00b190cafd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 442843db..cbf83425 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 442843db6f5dce6b594448d43b380c9b884a7c91 +Subproject commit cbf8342526c071bc77c3764e7a28c3cfe587bb80 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/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..50e4edb4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3e71f12de6995b2d9aa77b78f86251e49de8b2c5 +Subproject commit 50e4edb4b23947f9fcdb99ea0101660f0752cc1f 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..2dabbf20 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 787721b75c9af2c235e0a88550fda638593a1a0e +Subproject commit 2dabbf20b81fa0c85dbcd4f31f7c45819caca2d2 diff --git a/qtwayland b/qtwayland index 3ae8e08d..cdcd6e5b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3ae8e08df33e017f5be91b68118093776c46788c +Subproject commit cdcd6e5b729b64bef35faf293cff6731cd9eb832 diff --git a/qtwebengine b/qtwebengine index 721ca2f0..cf6768d8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 721ca2f0ed86002865518f74175ce88a04ea033b +Subproject commit cf6768d81ed7b9444e28ede6e26e125d5919b143 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/qtxmlpatterns b/qtxmlpatterns index 40a50c0c..ffd8366a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 40a50c0c585eaa838261742e33a547e09d4040d6 +Subproject commit ffd8366ad503649c6de365c427d0de15ab9a75db From 0ec6aad4551ae68742c369387b9edbd49c0db589 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Nov 2017 20:31:38 +0100 Subject: [PATCH 062/101] Update submodules on '5.9' in qt5 Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 252d2e5f..36005ba2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 252d2e5f2a237862cc50f926f66184d499298239 +Subproject commit 36005ba2873613c398698cf66e564388f0a8c06e diff --git a/qtbase b/qtbase index 25b18fb2..ce08318a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 25b18fb241315ed314b6b67f4b97028e2a1e484a +Subproject commit ce08318a46164172eaa72f4436cddf7f69ce9e1c diff --git a/qtconnectivity b/qtconnectivity index ca6b84af..7f0e5cb0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ca6b84af1612440a925b4a8223cbed4beb9ac33e +Subproject commit 7f0e5cb092574355f356777a3f2997c54e02139b diff --git a/qtdatavis3d b/qtdatavis3d index 32fc1c7d..34b202cf 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 +Subproject commit 34b202cf744bf7a5d076634ae2f64921ed3bc7e8 diff --git a/qtimageformats b/qtimageformats index feca51d8..a1504e8e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit feca51d8c714781378cecc99122035348e0459bb +Subproject commit a1504e8ecfc683691eb4be1f81b6a6e7920d85ab diff --git a/qtlocation b/qtlocation index 714145e7..e78a5ab5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 714145e7017afb74a23548ee9df2eff30536cfde +Subproject commit e78a5ab5cf4d932aea0503ac5684a95a235db8b1 diff --git a/qtmultimedia b/qtmultimedia index 4a214b19..cf4cc30d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4a214b199337a02e8cab77aa0cdca0c2805fb6a2 +Subproject commit cf4cc30da4566c1b8a86ee5688383f90eaf0e967 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 296810ea..a6d21e48 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 296810ea4bb4f734881a517eb101e5b948c1905b +Subproject commit a6d21e484a4d0f3308dbdb157e602ab5965bccf3 diff --git a/qtsvg b/qtsvg index c4c9b60d..18a2adad 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c4c9b60dc4bbe3c3837c80ea63682f3ef9403277 +Subproject commit 18a2adad907523ea31251ff0b62e3321241a40fa diff --git a/qttranslations b/qttranslations index 2578a31f..069f791e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2578a31f573d4f80a33153f4165216be59a51162 +Subproject commit 069f791e56e2421c0e29c0358732aba4e275ad4c diff --git a/qtwayland b/qtwayland index bfd08f5e..8875bb56 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bfd08f5ebd33e452c08595e5811698a16d3166fa +Subproject commit 8875bb5645742851e521d3a32a8a8779c46fc9f6 diff --git a/qtwebengine b/qtwebengine index d53efba0..e812237b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d53efba0b69e883ce70fa834856dcef61976725a +Subproject commit e812237b6980584fc5939f49f6a18315cc694c3a diff --git a/qtxmlpatterns b/qtxmlpatterns index b257f032..0b203483 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b257f032350c555ea52a7dad5a52d0312ab93b5c +Subproject commit 0b20348321b0c5663e46f293ed0ceb3c68594e63 From 35db040229c7502a7fb834aa74a0f0925f4ac278 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 18 Nov 2017 09:57:11 +0100 Subject: [PATCH 063/101] Update qtwebengine only Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index cf6768d8..f1003c50 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cf6768d81ed7b9444e28ede6e26e125d5919b143 +Subproject commit f1003c50652c1f5ef9ae0e16036b175fe3e8f215 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 064/101] 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 208baeb301492bb930ea05629b239a9d2c4489d2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 19 Nov 2017 20:13:46 +0100 Subject: [PATCH 065/101] Update submodules on '5.10' in qt5 Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 100cc447..5e94e34c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 100cc447253e84a3dc7df2a140731d7c85863780 +Subproject commit 5e94e34c5b9567980929e677357467806aacaf1a diff --git a/qtbase b/qtbase index c8a5f331..a4113d0c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c8a5f331c8fdbf243ccb467f7bc3c9f62bd47c9f +Subproject commit a4113d0c644edba1c39d9d268a259e95ae51c61e diff --git a/qtquickcontrols b/qtquickcontrols index aa081a76..48e60b9b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit aa081a76fe19fd606469c53a829c6f00b190cafd +Subproject commit 48e60b9b0a6fd2e9c1a548b1ca79bd5b81e93dd2 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 066/101] 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 9468be52db979d803f41c9de4089e5514a4735d0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Nov 2017 20:11:14 +0100 Subject: [PATCH 067/101] Update submodules on '5.9' in qt5 Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtpurchasing | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 36005ba2..e3e9372a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 36005ba2873613c398698cf66e564388f0a8c06e +Subproject commit e3e9372a353b641580f15dbbc09a488b8cb26d64 diff --git a/qtbase b/qtbase index ce08318a..ba2f3a15 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ce08318a46164172eaa72f4436cddf7f69ce9e1c +Subproject commit ba2f3a156ebc9ce3e6b6e59e231a5c2847163671 diff --git a/qtconnectivity b/qtconnectivity index 7f0e5cb0..22d20e81 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7f0e5cb092574355f356777a3f2997c54e02139b +Subproject commit 22d20e81d866b79e1e9fefe3f24f93aeb687a450 diff --git a/qtdeclarative b/qtdeclarative index 6990ae6c..d710a3a5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6990ae6c1bad32952e371fa72bee65a7af11c313 +Subproject commit d710a3a5b7a0b120d84674dc328418930b87b774 diff --git a/qtpurchasing b/qtpurchasing index 34ab68ce..c431c2d2 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 34ab68cee42e0ad3033e5a1831b0ca20b5761461 +Subproject commit c431c2d28cabf711727c09ee37559e44357358e3 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/qtserialbus b/qtserialbus index be9168ae..eec4d303 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit be9168aebae32a86094e6dfcb32b454b4887ff33 +Subproject commit eec4d3034e4f1371fe60728e3f84bcb8ddd32c93 From e6ddce15c3ce35c4bbd0e555155692215e5a03c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Nov 2017 20:40:21 +0100 Subject: [PATCH 068/101] Update submodules on '5.10' in qt5 Change-Id: I12db3b69a01215489142b271976e33050874bf5b Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtpurchasing | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 5e94e34c..bd5a98b5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5e94e34c5b9567980929e677357467806aacaf1a +Subproject commit bd5a98b5a283dccf00c346596c02a5739d25b09a 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 a4113d0c..d3e9b8c7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a4113d0c644edba1c39d9d268a259e95ae51c61e +Subproject commit d3e9b8c728f508fac56a48d63c4a393f2859a2aa 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/qtdatavis3d b/qtdatavis3d index 190687f6..966bdad4 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 190687f649bae0cb954652637255042f716fd110 +Subproject commit 966bdad4d56ebb06e94aa8f33cb70f15ec288976 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/qtmacextras b/qtmacextras index 74ca0bd1..a31b643d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 74ca0bd1b317399fbab08ed71e46307f78c0b07c +Subproject commit a31b643d92174465461194acc2919ec177c3995a 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/qtserialport b/qtserialport index c48e84e9..b0948ec0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c48e84e97ec5bf03ffc85625fe884042aa6b2e26 +Subproject commit b0948ec06644dd88ba8ec660c1fb39c49a6d0e70 diff --git a/qtwayland b/qtwayland index cdcd6e5b..00390ccf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cdcd6e5b729b64bef35faf293cff6731cd9eb832 +Subproject commit 00390ccf893aa02c8f51e0887624455c7e8d111d diff --git a/qtwebengine b/qtwebengine index f1003c50..ff34ca5e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f1003c50652c1f5ef9ae0e16036b175fe3e8f215 +Subproject commit ff34ca5ea77605e783203fc3cfc3b69dd4a8cbaa 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 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 069/101] 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 f113a65c6e95e1da5900f21b41de90e7af69f587 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Nov 2017 03:01:11 +0200 Subject: [PATCH 070/101] Update submodules on '5.10' in qt5 Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtscxml | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index bd5a98b5..b3ac1f6b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bd5a98b5a283dccf00c346596c02a5739d25b09a +Subproject commit b3ac1f6b441b66c5741981053deaff771807308e diff --git a/qtbase b/qtbase index d3e9b8c7..bdf1045b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d3e9b8c728f508fac56a48d63c4a393f2859a2aa +Subproject commit bdf1045b715e43eaedd1d9c4de78c4d7ce0e28ba diff --git a/qtscxml b/qtscxml index 4f94bae7..caed693d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4f94bae73ccabfc714d248c6371f1883aacc1aa8 +Subproject commit caed693d21b6e949de326137861908322e92e9f0 diff --git a/qtwebengine b/qtwebengine index ff34ca5e..188f1a64 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ff34ca5ea77605e783203fc3cfc3b69dd4a8cbaa +Subproject commit 188f1a64d27dd88950c212484e03dc23b817e1c3 diff --git a/qtwebglplugin b/qtwebglplugin index b5316079..9e758667 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit b5316079a8580f15c882c2972ed03fceb0378d51 +Subproject commit 9e758667d828151d8aea5c4eeeeff07c10792dc9 From f60bc7aa9d65100663eab388927c9f74e3e5d074 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 Nov 2017 03:01:08 +0200 Subject: [PATCH 071/101] Update submodules on '5.10' in qt5 Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index b3ac1f6b..e31186a7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b3ac1f6b441b66c5741981053deaff771807308e +Subproject commit e31186a7b27459823f3f8f5610ba7305241b50c7 diff --git a/qtbase b/qtbase index bdf1045b..dfa17203 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bdf1045b715e43eaedd1d9c4de78c4d7ce0e28ba +Subproject commit dfa172034e19b6011cc4e7c784b1a5b82996d630 diff --git a/qtdeclarative b/qtdeclarative index 131a7e3a..2f91b0f2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 131a7e3a544a90035dcab5e1aa6aff509395e155 +Subproject commit 2f91b0f25fff560de27632ec9d947c890426664e 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/qtwebengine b/qtwebengine index 188f1a64..781111af 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 188f1a64d27dd88950c212484e03dc23b817e1c3 +Subproject commit 781111af3498527d8652ae02fa64be3114c0734f diff --git a/qtwebglplugin b/qtwebglplugin index 9e758667..9eb58fab 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9e758667d828151d8aea5c4eeeeff07c10792dc9 +Subproject commit 9eb58fabd550b59e3c89834624b077a92a2a4475 From 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Nov 2017 15:15:46 +0100 Subject: [PATCH 072/101] 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 fdfe9e05ba6094156e3cc0ba9aeedeaf605618c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 25 Nov 2017 00:07:31 +0100 Subject: [PATCH 073/101] Update submodules on '5.10' in qt5 Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index dfa17203..6615f1d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dfa172034e19b6011cc4e7c784b1a5b82996d630 +Subproject commit 6615f1d16b442bbf476d86ab90af1107617945c9 diff --git a/qtdeclarative b/qtdeclarative index 2f91b0f2..b0f4d3ef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2f91b0f25fff560de27632ec9d947c890426664e +Subproject commit b0f4d3ef22731d6e0234451ff1176c221899ff15 diff --git a/qtwebengine b/qtwebengine index 781111af..d10007a2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 781111af3498527d8652ae02fa64be3114c0734f +Subproject commit d10007a2b15de7a530511968b4563164cb9e581b diff --git a/qtwebglplugin b/qtwebglplugin index 9eb58fab..8d3d896c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9eb58fabd550b59e3c89834624b077a92a2a4475 +Subproject commit 8d3d896cc2d47f2d4e1bffee60a159e8a60b6b43 From beb73056c30445c5236c7bbb12248bfa0939cb4a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 24 Nov 2017 16:35:48 +0200 Subject: [PATCH 074/101] 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 075/101] 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 eb3b287df13beccbe5aee16b45e654dfecc90560 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Nov 2017 03:01:00 +0200 Subject: [PATCH 076/101] Update submodules on '5.10' in qt5 Change-Id: I49d2ac31b572687781d8b1006f64206f57f3890a Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index d10007a2..75f794df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d10007a2b15de7a530511968b4563164cb9e581b +Subproject commit 75f794dfd1f60e4baefcaa53993cd817798a1b3f From 6675a8f416a2745b7934740be1610210796c4297 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Nov 2017 18:17:41 +0100 Subject: [PATCH 077/101] Add missing shbang to cmake provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was given execute permissions when renamed recently; but the bash-isms in it will only work with that if it uses bash. Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d7abd285..d10bc06d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1 +1,2 @@ +#!/usr/bin/env bash $(dirname $0)/../common/cmake_linux.sh 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 078/101] 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 079/101] 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 92a7d95947d27ef249d902852657ff61cf824dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 14 Nov 2017 10:12:53 +0200 Subject: [PATCH 080/101] Fix indentation in platform configurations Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +++++----- coin/platform_configs/qt5.txt | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 06a17b54..0f047cdc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 21c00e9d..d410c6aa 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -16,10 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From cdbd177b415a3826f8e85feec69757bf27f33ffa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 27 Nov 2017 15:12:34 +0200 Subject: [PATCH 081/101] Provisioning: Install bluez-libs-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bluez-libs-devel is needed to enable Qt Bluetooth Task-number: QTBUG-64782 Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0 Reviewed-by: Alex Blasche Reviewed-by: Tony Sarajärvi --- .../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 f7c6b694..8cdeee90 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 @@ -96,3 +96,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 6d37fda8c11d0860caad5a7968b6165843c05fa9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Nov 2017 18:38:42 +0200 Subject: [PATCH 082/101] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0 Reviewed-by: Tony Sarajärvi --- 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 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index e3e9372a..1129ff73 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e3e9372a353b641580f15dbbc09a488b8cb26d64 +Subproject commit 1129ff731fca6aff5849cafe1f434f1882342cd7 diff --git a/qtactiveqt b/qtactiveqt index cacf666f..2ba06b5c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cacf666f95df9790cebf5d5cdb0609cee257fab3 +Subproject commit 2ba06b5ce1f5203999039d044009d04a5e8dc484 diff --git a/qtandroidextras b/qtandroidextras index 92e56ec2..458d2358 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 +Subproject commit 458d2358e0e67cfcc267bb428a866503b559bd38 diff --git a/qtbase b/qtbase index ba2f3a15..5f66f871 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ba2f3a156ebc9ce3e6b6e59e231a5c2847163671 +Subproject commit 5f66f871816d083da9795d71f746413d6f6118f7 diff --git a/qtcanvas3d b/qtcanvas3d index 2dd53f17..26d3fb6d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2dd53f17ff626cd068be4cb04d793c53c71ed8f0 +Subproject commit 26d3fb6d1dc5346be654b82d362f3c128dc844ae diff --git a/qtcharts b/qtcharts index ab6f94d6..5d2cb8a4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ab6f94d6fb186d0003679fb4541c939555fd01c9 +Subproject commit 5d2cb8a429a7ed6244e80973cfcf94740859e174 diff --git a/qtconnectivity b/qtconnectivity index 22d20e81..a910c618 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 22d20e81d866b79e1e9fefe3f24f93aeb687a450 +Subproject commit a910c6185826977d5eabbb15ab2363761d6b75a3 diff --git a/qtdatavis3d b/qtdatavis3d index 34b202cf..cedc6261 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 34b202cf744bf7a5d076634ae2f64921ed3bc7e8 +Subproject commit cedc62610efb1add2a68a179a38db8e668560016 diff --git a/qtdeclarative b/qtdeclarative index d710a3a5..787dbda6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d710a3a5b7a0b120d84674dc328418930b87b774 +Subproject commit 787dbda672d6df4ff2336bb3afda62a233b88aaa diff --git a/qtdoc b/qtdoc index e4ccd4a7..d21d0d92 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 +Subproject commit d21d0d92e799d045a30091a3079d8e8b3cc77c66 diff --git a/qtgamepad b/qtgamepad index 0e2408a2..c1e52bd4 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0e2408a2729a5977182cb30d7e5ebd29a657673a +Subproject commit c1e52bd4a3f1fc996bd6b885b4e98ad5b216cbee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7ab12ad1..7d385752 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7ab12ad1483607cf3f007c591e998f40f2ec9513 +Subproject commit 7d38575239d10598cb65b9f0ffabca0e018d07a5 diff --git a/qtimageformats b/qtimageformats index a1504e8e..e807afe5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a1504e8ecfc683691eb4be1f81b6a6e7920d85ab +Subproject commit e807afe5e218a1db802d2af1ba6c83a7ccf429f0 diff --git a/qtlocation b/qtlocation index e78a5ab5..3f06c2da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e78a5ab5cf4d932aea0503ac5684a95a235db8b1 +Subproject commit 3f06c2dad7c90771df3ea98435097bda9c08cbeb diff --git a/qtmacextras b/qtmacextras index 25127376..508db880 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 25127376ff49055eec43039c9bf6795f58de1e94 +Subproject commit 508db880f0e3506679c65ee24ff0935351daa484 diff --git a/qtmultimedia b/qtmultimedia index cf4cc30d..a621c53d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cf4cc30da4566c1b8a86ee5688383f90eaf0e967 +Subproject commit a621c53dd9103c3d41cb16763f7b7dba372b67a6 diff --git a/qtpurchasing b/qtpurchasing index c431c2d2..d5b1a88c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit c431c2d28cabf711727c09ee37559e44357358e3 +Subproject commit d5b1a88c7a51bb4a192c20dd494dac580e238110 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/qtquickcontrols b/qtquickcontrols index a6d21e48..00bfab66 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a6d21e484a4d0f3308dbdb157e602ab5965bccf3 +Subproject commit 00bfab6671fda57cc34aa84335a6c47ffb0df98e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a0559ea8..bd617ed6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a0559ea88be32e19e83b2131cb26e61e873dc817 +Subproject commit bd617ed62ba35ee11da75b7e92db3fd190751b0f 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/qtscxml b/qtscxml index 3d238184..3aa7c73a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3d23818472e371745f4ad4bd4b6c92de3d119e34 +Subproject commit 3aa7c73a97af0d44666fc70570853182612c0c9a diff --git a/qtsensors b/qtsensors index a8f64f49..90e56c11 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a8f64f49ddffd44ca748bb25758d6aa3e71d48ef +Subproject commit 90e56c11caa0251ed3f6f5620869512e1a8e6cf1 diff --git a/qtserialbus b/qtserialbus index eec4d303..0ace2c05 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit eec4d3034e4f1371fe60728e3f84bcb8ddd32c93 +Subproject commit 0ace2c053464ac08cc93a8319e38df50e1c3acbf diff --git a/qtserialport b/qtserialport index dd9fdb2b..8fd986ec 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 +Subproject commit 8fd986ec9aec0503985fbd0704f0671d58a1e3a5 diff --git a/qttools b/qttools index 4c2cae79..ead44273 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4c2cae795117897847c0ba0e9b9ff20fa6e4eda9 +Subproject commit ead4427365690b72de63eaf2cd9a1f51fadcc0da diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 19cae9dd..78873735 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 19cae9ddecbff856e5ff0e294402091db0c2484b +Subproject commit 78873735b041f6eeb4bbd22d3284457ce40e9d06 diff --git a/qtwayland b/qtwayland index 8875bb56..a02a48fc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8875bb5645742851e521d3a32a8a8779c46fc9f6 +Subproject commit a02a48fc50203350c631dcb2032737a22a19b81b diff --git a/qtwebchannel b/qtwebchannel index 87044174..9196ca1b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 87044174033f141d8d333e2a442d826d87db0415 +Subproject commit 9196ca1b09ba5cc6b6910c775906fcff4c4d6eac diff --git a/qtwebengine b/qtwebengine index e812237b..531665a2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e812237b6980584fc5939f49f6a18315cc694c3a +Subproject commit 531665a20c93b6b53fafdffbc3e58a923c3e3122 diff --git a/qtwebsockets b/qtwebsockets index 203da360..45771796 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 203da360c4bcd64bdd17639d495f1857b622e92d +Subproject commit 4577179620f98be257ad745c5b406d92b3b16aba diff --git a/qtwebview b/qtwebview index 71932e38..68423dce 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 71932e381ee12528f6516f61c5467f322d8ee903 +Subproject commit 68423dce756f1df7f282b8cdbe0c7fead91d1ff2 diff --git a/qtwinextras b/qtwinextras index ea7de894..494bde3b 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ea7de894f711d8fa4f6cf78b5a409889849ee1f2 +Subproject commit 494bde3bd59465b1c953fb4449db1ae45b714e16 diff --git a/qtx11extras b/qtx11extras index f21ef0cd..d1a3ecdc 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f21ef0cd01ccf1ccdbb2211eb935aff402741969 +Subproject commit d1a3ecdc4dc385f6f24791bf2e9ba8dc5041216f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0b203483..431a23f2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0b20348321b0c5663e46f293ed0ceb3c68594e63 +Subproject commit 431a23f274f6bae1dc9e8cdd13b4ac993f5a0991 From 2b7b098700ae81482fb82754ad5bcba93c7e433d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Nov 2017 03:01:11 +0200 Subject: [PATCH 083/101] Update submodules on '5.10' in qt5 Change-Id: I88c38e77cad31acd45bb0ffea14fbfee48d5ee4c Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index e31186a7..239d3cac 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e31186a7b27459823f3f8f5610ba7305241b50c7 +Subproject commit 239d3cac8aa3558f3ac889b8a348ab0c5e18df06 diff --git a/qtbase b/qtbase index 6615f1d1..d0812cbd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6615f1d16b442bbf476d86ab90af1107617945c9 +Subproject commit d0812cbdabcff4d388334c499c23992cce98d4da diff --git a/qtdeclarative b/qtdeclarative index b0f4d3ef..430c14fb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b0f4d3ef22731d6e0234451ff1176c221899ff15 +Subproject commit 430c14fb91bd46510cc2895c343358872f809889 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/qtwebengine b/qtwebengine index 75f794df..f9eb2b95 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 75f794dfd1f60e4baefcaa53993cd817798a1b3f +Subproject commit f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 From 60f02cdfae9d2494b9aba4d25f59657f49be0398 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Nov 2017 08:40:40 +0100 Subject: [PATCH 084/101] Update submodules on '5.9' in qt5 Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 5f66f871..6508fdca 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f66f871816d083da9795d71f746413d6f6118f7 +Subproject commit 6508fdca1dcc7105947befadba272d0fd4bbc27f diff --git a/qtdeclarative b/qtdeclarative index 787dbda6..8bdf3305 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 787dbda672d6df4ff2336bb3afda62a233b88aaa +Subproject commit 8bdf33051aa679db1f060314c6ccab1cb9a77a7a diff --git a/qtlocation b/qtlocation index 3f06c2da..cd24931b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3f06c2dad7c90771df3ea98435097bda9c08cbeb +Subproject commit cd24931b171f73d6ba71450493e9d5a8142a67a5 diff --git a/qtwayland b/qtwayland index a02a48fc..800c71ca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a02a48fc50203350c631dcb2032737a22a19b81b +Subproject commit 800c71ca816d76ac4de0616bf54b87f3c1f14c0a diff --git a/qtwebengine b/qtwebengine index 531665a2..5bd5dff7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 531665a20c93b6b53fafdffbc3e58a923c3e3122 +Subproject commit 5bd5dff7b4267d26476043d7f89fe336dc9be5a6 diff --git a/qtwebsockets b/qtwebsockets index 45771796..1b9a3c75 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4577179620f98be257ad745c5b406d92b3b16aba +Subproject commit 1b9a3c75259ceaa5e475b47e396a548c475df401 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 085/101] 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 086/101] 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" From f8712c099da9e928a388febafe5433cf15297847 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 3 Dec 2017 03:00:48 +0200 Subject: [PATCH 087/101] Update submodules on '5.10' in qt5 Change-Id: Ifd29751e627dbefb3f93c5f3ce4ff2cfec5d59fb Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 239d3cac..9e35f9e4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 239d3cac8aa3558f3ac889b8a348ab0c5e18df06 +Subproject commit 9e35f9e4beafdea9c6dd0b88496198cd7590a566 diff --git a/qtbase b/qtbase index d0812cbd..22ec92a2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d0812cbdabcff4d388334c499c23992cce98d4da +Subproject commit 22ec92a201beb9ec4bb6a7e21fcfdc8cd9b884f9 diff --git a/qtdeclarative b/qtdeclarative index 430c14fb..f98e83d6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 430c14fb91bd46510cc2895c343358872f809889 +Subproject commit f98e83d66c4315e58f777150e129e25fdaa4312f diff --git a/qtwebengine b/qtwebengine index f9eb2b95..411cfff4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 +Subproject commit 411cfff476740d1da1b179aa2976e8267607e18d From 8ab923d0e5f0cc54904eddd80a814cab2b5d85ee Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 5 Dec 2017 08:35:48 +0100 Subject: [PATCH 088/101] Update submodules on '5.9' in qt5 Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 6508fdca..0c9e379d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6508fdca1dcc7105947befadba272d0fd4bbc27f +Subproject commit 0c9e379dd8c57fab9d8e6ba8d35a0dca8ac05a0a diff --git a/qtcanvas3d b/qtcanvas3d index 26d3fb6d..f4d7923a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 26d3fb6d1dc5346be654b82d362f3c128dc844ae +Subproject commit f4d7923aaaaee0c8fe131040de4dc3cf92fd7195 diff --git a/qtcharts b/qtcharts index 5d2cb8a4..6cde98b2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d2cb8a429a7ed6244e80973cfcf94740859e174 +Subproject commit 6cde98b2254e6197a285a83617c952fd1d14cb3d diff --git a/qtdeclarative b/qtdeclarative index 8bdf3305..823428d9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8bdf33051aa679db1f060314c6ccab1cb9a77a7a +Subproject commit 823428d994b0ec0f6b85288d74554660a51b2406 diff --git a/qtlocation b/qtlocation index cd24931b..8552cf9d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cd24931b171f73d6ba71450493e9d5a8142a67a5 +Subproject commit 8552cf9d96d96dc500743dfbc117f0634cab0590 diff --git a/qtmultimedia b/qtmultimedia index a621c53d..c60d87c3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a621c53dd9103c3d41cb16763f7b7dba372b67a6 +Subproject commit c60d87c314d467997701729104ce02c9ed5c6501 diff --git a/qtwebengine b/qtwebengine index 5bd5dff7..f979b271 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5bd5dff7b4267d26476043d7f89fe336dc9be5a6 +Subproject commit f979b271e158bc93b7361d4b891ed49ee58ab865 From b6a1fc6aaec15310f702b3873798363f5a89bb21 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 24 Nov 2017 16:35:48 +0200 Subject: [PATCH 089/101] Install command line tools for osx 10.11 and macOS 10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit beb73056c30445c5236c7bbb12248bfa0939cb4a) Reviewed-by: Tony Sarajärvi --- .../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..f224d31d --- /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 install" + exit 1; + ;; + $ExceptionUnmount) + echo "Failed to unmount" + 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 5d9e2c49d116f62f263adf3e9502e06c33f59152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 8 Dec 2017 14:51:01 +0200 Subject: [PATCH 090/101] Update ICC compiler from 2018 to 2018 update 1 Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696 Reviewed-by: Thiago Macieira Reviewed-by: Liang Qi --- .../qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 4933269a..15b46aef 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -42,12 +42,12 @@ set -e mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc.lic" +iccLicense="l_icc_2018.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -79,7 +79,7 @@ EOT # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.0 20170811" >> ~/versions.txt +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt rm -rf "$iccTmpPath" From d9f2fe1b7f9b90815b4056c89ec2f670ff12180f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 21 Nov 2017 11:23:41 +0100 Subject: [PATCH 091/101] Add b2qt developer build for qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because we had enabled this for qtdeclarative before. Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtbase.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 coin/platform_configs/qtbase.txt diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt new file mode 100644 index 00000000..45810bce --- /dev/null +++ b/coin/platform_configs/qtbase.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild, DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild, DisableTests From 7d04dc1a291b1306be2dad2c27a1b11ae6c11b63 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Nov 2017 14:04:27 +0100 Subject: [PATCH 092/101] Move INTEGRITY build from qt5 to default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many failures in qtbase on INTEGRITY happened recently. Change-Id: Ic55259e694961a53199d30f095159728207f8824 Reviewed-by: Kimmo Ollila Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 1 + coin/platform_configs/qt5.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 0f047cdc..39f0373d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,3 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d410c6aa..5282634a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -22,4 +22,3 @@ qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packagin qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From a0e1f4f480149c4a3cac0294c6c7cab2ad0ab76e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 9 Dec 2017 03:01:01 +0200 Subject: [PATCH 093/101] Update submodules on '5.10' in qt5 Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8 Reviewed-by: Qt Submodule Update Bot Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index 9e35f9e4..8470becd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9e35f9e4beafdea9c6dd0b88496198cd7590a566 +Subproject commit 8470becd886d299c1be892d8113dfff216035611 diff --git a/qtactiveqt b/qtactiveqt index 99611af4..3f1310a3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 99611af4845e4c7893a03c0b13f2fd2275f318e3 +Subproject commit 3f1310a3193a36315dcf0b093451103ad046e1e4 diff --git a/qtandroidextras b/qtandroidextras index 64f26453..be708914 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 64f2645337429e2af9ac345872c67b5354e3be10 +Subproject commit be7089148192ec8e80ea50665ec2df421cf0c4c6 diff --git a/qtbase b/qtbase index 22ec92a2..812bb236 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22ec92a201beb9ec4bb6a7e21fcfdc8cd9b884f9 +Subproject commit 812bb236dd1622896b6a0ca9bbe1334a69855aa2 diff --git a/qtcanvas3d b/qtcanvas3d index ff91031e..f4d043c7 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ff91031e167f51d7f75adc71ded91e9291fbfb77 +Subproject commit f4d043c71f1f14868b130e46a1a844ee7cdfe505 diff --git a/qtcharts b/qtcharts index afd07787..a58dfcb2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit afd077876bd5203944a3ed73f4f1fb998f795ee2 +Subproject commit a58dfcb2460a2dd4db83a33bb5349e94303e6278 diff --git a/qtconnectivity b/qtconnectivity index 5a382311..cf0df8be 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5a38231103159346c976a620c01fba37eea85d92 +Subproject commit cf0df8be7f4cc809672f98507c1723015a0741bc diff --git a/qtdatavis3d b/qtdatavis3d index 966bdad4..cf4bf696 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 966bdad4d56ebb06e94aa8f33cb70f15ec288976 +Subproject commit cf4bf696641dbcd142f2e0e7057d7cb70b6722e0 diff --git a/qtdeclarative b/qtdeclarative index f98e83d6..8283bc83 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f98e83d66c4315e58f777150e129e25fdaa4312f +Subproject commit 8283bc83857ed8c7d85b61d2dc3b35fa4e96a037 diff --git a/qtdoc b/qtdoc index 08bd2bd9..21c0ac79 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 08bd2bd92c1ce9694d1182609c131747eed7165f +Subproject commit 21c0ac79d94bbf9c999de45cff8086ca94de6d08 diff --git a/qtgamepad b/qtgamepad index 2c9609cb..f2983c52 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2c9609cb0a5ba41fbffbca3dba80b65a15509937 +Subproject commit f2983c524d1a3f350b48265a033fd9a3f69c0d73 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7576f0e2..df1c9dba 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7576f0e27e9d34f084caeb83281f1a4a6e0965dd +Subproject commit df1c9dbad75010fc967f4a236393fa1de36110f2 diff --git a/qtimageformats b/qtimageformats index 4d4de2e0..167e7d19 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4d4de2e070178510afb7f160c2594ae7af34f782 +Subproject commit 167e7d191b3751a061842e332036dd6989d68a2c diff --git a/qtlocation b/qtlocation index afc51951..b2e0a242 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit afc51951769ac7320a98a973bcb95a12bc970019 +Subproject commit b2e0a242a8c77d8cff186ef25b8360927c955941 diff --git a/qtmacextras b/qtmacextras index a31b643d..2bc33d6e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a31b643d92174465461194acc2919ec177c3995a +Subproject commit 2bc33d6e70fcf16aedeead643ab1c39ca090615b diff --git a/qtmultimedia b/qtmultimedia index 5af70385..10304528 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5af70385a0b1a04e10d088f655ee33338ec014c5 +Subproject commit 10304528c20fb9a385c617a38b6be35d1b18598a diff --git a/qtnetworkauth b/qtnetworkauth index 69512ab9..bebf6f48 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 69512ab9b27eb8615a78d12aa99752df70127c69 +Subproject commit bebf6f4816c8025b592c260577dbf09fc0f4ed7e diff --git a/qtpurchasing b/qtpurchasing index 4358df9b..4b87fcdf 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4358df9bef910c63400cf0dcfc58aa404fb8f1ad +Subproject commit 4b87fcdf70d14b288e4859156403c3d2886020fa diff --git a/qtquickcontrols b/qtquickcontrols index 48e60b9b..5bc43105 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 48e60b9b0a6fd2e9c1a548b1ca79bd5b81e93dd2 +Subproject commit 5bc4310529a8ae5cfc18afda1a1b788691448d6e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cbf83425..eb7551d5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cbf8342526c071bc77c3764e7a28c3cfe587bb80 +Subproject commit eb7551d5d5e5155606e21158ead1541546bc2149 diff --git a/qtscxml b/qtscxml index caed693d..81b0d786 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit caed693d21b6e949de326137861908322e92e9f0 +Subproject commit 81b0d78673f5a632e3891d048be9a08fe48351d1 diff --git a/qtsensors b/qtsensors index fc60f538..af1372a4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fc60f53817d3182c545cef15e3ab94a85ef01379 +Subproject commit af1372a4e69d5a7664142df06b0b96d7cd197340 diff --git a/qtserialbus b/qtserialbus index 50e4edb4..e13737e5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 50e4edb4b23947f9fcdb99ea0101660f0752cc1f +Subproject commit e13737e5de8d3a2653e97de365412c28bd6c6124 diff --git a/qtserialport b/qtserialport index b0948ec0..98454fbc 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0948ec06644dd88ba8ec660c1fb39c49a6d0e70 +Subproject commit 98454fbc2a687a6440ae5e61070ebd6073e8016d diff --git a/qttools b/qttools index 6491ca02..84e40c5f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6491ca02253f3245333611cabf248ef01bd31883 +Subproject commit 84e40c5f4d78a6d4a0ae1d87323a20ed96f319d6 diff --git a/qttranslations b/qttranslations index 0d153fe5..c30c9e0a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0d153fe51ba4dc4ace8e8308b8e9ea478c75ffa0 +Subproject commit c30c9e0ae178cf3d3f20c058097d8f596f8df886 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2dabbf20..685ae5ca 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2dabbf20b81fa0c85dbcd4f31f7c45819caca2d2 +Subproject commit 685ae5ca057d37ec2ca909fb08b5610b1829edc1 diff --git a/qtwayland b/qtwayland index 00390ccf..61f92b67 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 00390ccf893aa02c8f51e0887624455c7e8d111d +Subproject commit 61f92b6742c96f4974e23893ba6926e4d012cd09 diff --git a/qtwebchannel b/qtwebchannel index 07cbe313..5e43b636 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 07cbe31332c518993ad8fc5c519abf64a83d4ab9 +Subproject commit 5e43b6364b6c0bbeb67772581e550fc3e64e9008 diff --git a/qtwebengine b/qtwebengine index 411cfff4..6921ebd6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 411cfff476740d1da1b179aa2976e8267607e18d +Subproject commit 6921ebd6d8bc8bb62d9118c7a1a750f2fd787897 diff --git a/qtwebglplugin b/qtwebglplugin index 8d3d896c..f73929c2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8d3d896cc2d47f2d4e1bffee60a159e8a60b6b43 +Subproject commit f73929c2c6c9229f71470502faab14178d561157 diff --git a/qtwebsockets b/qtwebsockets index 57e1ebec..30e3ccc8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b +Subproject commit 30e3ccc84031e5530ee38ab4a790267557067205 diff --git a/qtwebview b/qtwebview index 177956a5..f0a48620 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 177956a5e25eae1efd9a31f8ababff473a7d592f +Subproject commit f0a48620d5d647ea1e2153a522a948f5b0fedc15 diff --git a/qtwinextras b/qtwinextras index 3ad89fd9..8be91fab 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3ad89fd9022e2010eeca7dfa2548eb149dc34fe6 +Subproject commit 8be91fab769e1d55a3146acb04102df67968efd1 diff --git a/qtx11extras b/qtx11extras index 24f802dc..8e4810cf 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 24f802dc02176d8f50d77be58b872ad525ed1a52 +Subproject commit 8e4810cf73a4294eacafede22f93f4bda8dab1bf diff --git a/qtxmlpatterns b/qtxmlpatterns index ffd8366a..3cd6679d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ffd8366ad503649c6de365c427d0de15ab9a75db +Subproject commit 3cd6679d8702fef3f0d3614724375577945fcf05 From b12a1591c404f2f0a4b0d00c7dc11650b811ee4e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 8 Nov 2017 16:21:17 +0200 Subject: [PATCH 094/101] Provisioning: Install signing tools to Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signing tools are needed when signing offline installers Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/signing-tools.ps1 | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 new file mode 100644 index 00000000..882bd1de --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# Signing tools are needed to sign offline installers when releasing + +$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" +$destination = "C:\Windows\temp\sign.zip" + +Download $url $url $destination +Extract-Zip "$destination" "C:\Utils" +Remove-Item "$destination" From 5089c4468f67daa2b28c710923ecfdd921f295e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 24 Nov 2017 12:36:57 +0200 Subject: [PATCH 095/101] Fix mesa_llvmpipe provisioning script for x64 Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script doesn't extract the dll to System32 on a x64 system. Calling "sysnative" doesn't seem to work with the custom function being used. Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/mesa_llvmpipe.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 index 7ea0629d..82333034 100644 --- a/coin/provisioning/common/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/mesa_llvmpipe.ps1 @@ -55,7 +55,7 @@ function Extract-Mesa } if ( Test-Path C:\Windows\SysWOW64 ) { - Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative" + Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32" Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" } else { Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" From 77fdde0de933ef15aadad1a9e1baa50578ba6c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 29 Nov 2017 14:36:04 +0200 Subject: [PATCH 096/101] RHEL7.4: install packages in one yum instance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are opening and closing a yum instance for every package we install during provisioning. This is a bit inefficient so it's better to install them in one go. Task-number: QTQAINFRA-1586 Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27 Reviewed-by: Tony Sarajärvi --- .../004-install-packages.sh | 89 ++++++++----------- 1 file changed, 37 insertions(+), 52 deletions(-) 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 8cdeee90..7bda43e2 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 @@ -35,67 +35,52 @@ set -e -sudo yum -y update - -sudo yum -y install git -sudo yum -y install zlib-devel -sudo yum -y install glib2-devel -sudo yum -y install openssl-devel -sudo yum -y install freetype-devel -sudo yum -y install fontconfig-devel - +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) # EGL support -sudo yum -y install mesa-libEGL-devel -sudo yum -y install mesa-libGL-devel - -sudo yum -y install libxkbfile-devel - +installPackages+=(mesa-libEGL-devel) +installPackages+=(mesa-libGL-devel) +installPackages+=(libxkbfile-devel) # Xinput2 -sudo yum -y install libXi-devel - -sudo yum -y install python-devel -sudo yum -y install mysql-server mysql -sudo yum -y install mysql-devel -sudo yum -y install postgresql-devel -sudo yum -y install cups-devel -sudo yum -y install dbus-devel - -# We have to downgrade to an older version of graphite2 -# to avoid a dependency version mismatch with gtk3-devel package. - -sudo yum -y downgrade graphite2-1.3.6-1.el7_2 - +installPackages+=(libXi-devel) +installPackages+=(python-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) # gstreamer 1 for QtMultimedia -sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel - +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) # gtk3 style for QtGui/QStyle -sudo yum -y install gtk3-devel - +installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb -sudo yum -y install libusb-devel - +installPackages+=(libusb-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux -sudo yum -y install speech-dispatcher-devel - +installPackages+=(speech-dispatcher-devel) # Python -sudo yum -y install python-devel python-virtualenv - +installPackages+=(python-devel python-virtualenv) # WebEngine -sudo yum -y install bison -sudo yum -y install flex -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 - +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(alsa-lib-devel) +installPackages+=(pulseaudio-libs-devel) +installPackages+=(libXtst-devel) # For Android builds -sudo yum -y install java-1.8.0-openjdk-devel - +installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum -sudo yum -y install perl-Digest-SHA - +installPackages+=(perl-Digest-SHA) # INTEGRITY requirements -sudo yum -y install glibc.i686 - +installPackages+=(glibc.i686) # Enable Qt Bluetooth -sudo yum -y install bluez-libs-devel +installPackages+=(bluez-libs-devel) + +sudo yum -y update +sudo yum -y install "${installPackages[@]}" From 74dd14ae836e3432c990f6e8691d4c214bfa3f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 5 Dec 2017 09:24:50 +0200 Subject: [PATCH 097/101] Remove provisioning scripts from non existing platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" From 828f82b6f00946c194b6909559bdce0b40d0f9a8 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 5 Dec 2017 11:14:15 +0200 Subject: [PATCH 098/101] Add missing name prefixes for Win7 provision scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The prefix numbers were missing for Ruby and QNX patch scripts. Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 + 3 files changed, 3 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" From 35db81f33efe6eb82e27007e144eafffd2bff4eb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Nov 2017 15:15:46 +0100 Subject: [PATCH 099/101] Add NSS to RHEL 7.4 Needed by QtWebEngine Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca Reviewed-by: Jani Heikkinen (cherry-picked from 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f) Reviewed-by: Allan Sandfeld Jensen --- .../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 7bda43e2..a8e812bd 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 @@ -73,6 +73,8 @@ installPackages+=(gperf) installPackages+=(alsa-lib-devel) installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) +installPackages+=(nspr-devel) +installPackages+=(nss-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum From e067ea2a7299ff2567dd820435884b293ae7489d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Dec 2017 20:10:33 +0200 Subject: [PATCH 100/101] Update submodules on '5.9' in qt5 Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d Reviewed-by: Liang Qi --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 0c9e379d..d2d6c6f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0c9e379dd8c57fab9d8e6ba8d35a0dca8ac05a0a +Subproject commit d2d6c6f7813fa38ced6b80ead763ed6e6daaa951 diff --git a/qtdatavis3d b/qtdatavis3d index cedc6261..c3a97327 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cedc62610efb1add2a68a179a38db8e668560016 +Subproject commit c3a973273e3c7ac61b8dd9aec282847d30fd4ac1 diff --git a/qtdeclarative b/qtdeclarative index 823428d9..41293196 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 823428d994b0ec0f6b85288d74554660a51b2406 +Subproject commit 41293196b4db1aa7a0c616af312875c484639644 diff --git a/qttools b/qttools index ead44273..f8bb798a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ead4427365690b72de63eaf2cd9a1f51fadcc0da +Subproject commit f8bb798ade81f152bc8ff2028e4974150171fa08 diff --git a/qtwayland b/qtwayland index 800c71ca..e74ff73d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 800c71ca816d76ac4de0616bf54b87f3c1f14c0a +Subproject commit e74ff73d2b2acef0b97530a2c7dd52e20ada6239 diff --git a/qtwebengine b/qtwebengine index f979b271..9f798b78 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f979b271e158bc93b7361d4b891ed49ee58ab865 +Subproject commit 9f798b787a2542688c30503d3f62fe2d7c4d5a72 From 91df8a3a8f313dd9914ba9bd221ac6cdbf497f99 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 11 Dec 2017 10:56:31 +0100 Subject: [PATCH 101/101] Fix syntax error - not use comma in platform_configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ammends d9f2fe1b7f9b90815b4056c89ec2f670ff12180f Task-number: QTQAINFRA-1636 Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtbase.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 45810bce..3292cc6e 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild, DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild, DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests