From 84aaf6871c6d08beb68cfb9fe50b2188965b196f Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 25 Mar 2019 10:07:35 +0200 Subject: Adjust submodule branches Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..f65bd875 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.3 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.3 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.3 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.3 status = addon -- cgit v1.2.3 From d0d7ade7598290cd3f9365b46f287c2b8c3ed3f3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 30 Mar 2019 09:22:12 +0100 Subject: Update submodules on '5.12.3' in qt5 Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 2f97a050..ae5db669 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e +Subproject commit ae5db669e8989fe793949346d8061c67e5ec31cd diff --git a/qtdeclarative b/qtdeclarative index 42ed40cf..8ec25f30 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42ed40cf0abd0155d6e6d1ef01faf9bded065588 +Subproject commit 8ec25f301d08e981ca066755ffea582c5cbdf1b0 diff --git a/qtgamepad b/qtgamepad index cd571466..c6cb03e6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit cd571466dc25674b25f34a3e2476c6a0b53dd25f +Subproject commit c6cb03e61ed17c92b316ab0d6af86278c6abd45c diff --git a/qtqa b/qtqa index dc4cbd9f..ba041bc9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit ba041bc942056d52804acd5011ae5fe7877be045 diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qttranslations b/qttranslations index 7baf16d1..8e821a98 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7baf16d13b463ed86879e8a109ff3b4ba4ae8e46 +Subproject commit 8e821a98b735b61e554ec16a2e37bebcb8218107 diff --git a/qtwebengine b/qtwebengine index 1fe5566c..ea65bb32 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b +Subproject commit ea65bb32fa988b37d030c3737b8a036f049d1354 -- cgit v1.2.3 From 7ff76b89dd4243e3d6ba043dbf6703ae6c3ff6e2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Apr 2019 04:03:02 +0000 Subject: Update submodules on '5.12.3' in qt5 Change-Id: I216b93959076bc9402c715599398dea770cacde2 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index fa12f14b..29c20fda 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 +Subproject commit 29c20fda753f25bd142e18d511d28da68c6361c2 diff --git a/qtactiveqt b/qtactiveqt index 0a091107..766c1133 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0a0911079d25b529b102fb2c4ba2de2cb45b9e5d +Subproject commit 766c1133cb7906205b63090bc46790832f6dc7b8 diff --git a/qtandroidextras b/qtandroidextras index 5e920ecf..b059d677 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 5e920ecff160ddf7374023802918385ad699d786 +Subproject commit b059d6777177c28f501c5fc627f7a577ba9d482f diff --git a/qtbase b/qtbase index ae5db669..a0b5d6e6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ae5db669e8989fe793949346d8061c67e5ec31cd +Subproject commit a0b5d6e60f96359d88352e0b1c000678cdc80988 diff --git a/qtcanvas3d b/qtcanvas3d index ad4ac1b1..912b9b3b 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ad4ac1b1493cc637ab7280196a948fac9bef091e +Subproject commit 912b9b3b1318aac4cef681315ae1588105eaf410 diff --git a/qtcharts b/qtcharts index c0f0d22a..9755f474 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c0f0d22a1ae85c7efafb4cee6d0e59effb68262c +Subproject commit 9755f474a039756b98ce9c2bf0a69809b1396004 diff --git a/qtconnectivity b/qtconnectivity index c488aedb..6a8a8f32 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c488aedb42cda76085cfc0ed2602c34c3b5353a6 +Subproject commit 6a8a8f328d1782319b4dc0e4b3497e6613e0f864 diff --git a/qtdatavis3d b/qtdatavis3d index c71ab9eb..edabd45a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c +Subproject commit edabd45add4b440b40e05f742a5a3a8b124cf72e diff --git a/qtdeclarative b/qtdeclarative index 8ec25f30..17884e1e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8ec25f301d08e981ca066755ffea582c5cbdf1b0 +Subproject commit 17884e1e3c7c40cd104dceb9452dd2df6058c32d diff --git a/qtdoc b/qtdoc index 9c821c6d..adaefd7c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 +Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e7ab193d..8cf6af2c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e7ab193d855806d7333577ad7d9d15165d1b5cf8 +Subproject commit 8cf6af2c897a822e040015b169fbf13f3db63ebf diff --git a/qtimageformats b/qtimageformats index 4b0d658f..17ac003f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a +Subproject commit 17ac003f6072e62ba9de7e75f3de8b8509dcd2c3 diff --git a/qtlocation b/qtlocation index 6e02f895..a8ecb451 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6e02f895a8f3a74503971dd8df02cfafd46281f8 +Subproject commit a8ecb45143823912baef2426f8e352159fcb0f9a diff --git a/qtmacextras b/qtmacextras index cc0df66a..1a1188d0 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit cc0df66a3e3ed4099fba96eeb287239405d49a19 +Subproject commit 1a1188d04a127610736d8c4eb92df43a7565ee16 diff --git a/qtmultimedia b/qtmultimedia index d665520e..c7e73519 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d665520e8bd23121160d82cada34ff625e0d0cfe +Subproject commit c7e735198c6cc01201f90b64c8a6d35fc40584fc diff --git a/qtnetworkauth b/qtnetworkauth index 88fa9ac9..0da27832 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 88fa9ac94241a182f8ad92a692eccabbc0caa9cc +Subproject commit 0da27832617a17788da4fdd6838f8aa6d8c70f65 diff --git a/qtpurchasing b/qtpurchasing index 634f8e54..45f2b4a6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 634f8e549291b96434941b1dc29d665fdf29f980 +Subproject commit 45f2b4a63489c614e0060b511e00245c599fbb70 diff --git a/qtqa b/qtqa index ba041bc9..8a0c738d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ba041bc942056d52804acd5011ae5fe7877be045 +Subproject commit 8a0c738d9b4d4fe739714ae7a7fcea2a71581285 diff --git a/qtquickcontrols b/qtquickcontrols index c901f6d2..1edf84ef 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c901f6d2ee7f73f58881424b05d57360720fa7d9 +Subproject commit 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5135bec5..db38242b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5135bec50762955b3a1138ecda10214a9d0bf62a +Subproject commit db38242b288fe3ca8f7461cf344b757a9ca0947d diff --git a/qtscript b/qtscript index 6522303c..038f6305 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b +Subproject commit 038f6305610a80f39d3416b95b5df96fab0c801d diff --git a/qtscxml b/qtscxml index 554ac455..daad96b2 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 554ac4551c154f39de2917877b189b74e4464d3b +Subproject commit daad96b2b9a4b503aebbea4f77887973dd8ff8ee diff --git a/qtsensors b/qtsensors index f5281044..6b7f7f5c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f528104474dd74e34ea6a01da096e7c31730c01a +Subproject commit 6b7f7f5ceb7a230307c004021a2f16f3dabdf759 diff --git a/qtserialbus b/qtserialbus index 4a52df0a..d5b3a2b6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 +Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad diff --git a/qtserialport b/qtserialport index 0ab5636a..208e76d0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0ab5636aee10d8578307beb90c69e27f7f69574b +Subproject commit 208e76d05719fe2262ff6e162786894ddb3d0fb6 diff --git a/qtsvg b/qtsvg index d477ec8f..15f74a0f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d477ec8f40b28caf3a216d9e8550d8871d5131fb +Subproject commit 15f74a0f8a41759e1216d52d53852c05c9299107 diff --git a/qttools b/qttools index 9c7502b0..50335cb2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9c7502b0e5056da021ace0195e53d5b7b410120b +Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 diff --git a/qttranslations b/qttranslations index 8e821a98..0987e6cb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8e821a98b735b61e554ec16a2e37bebcb8218107 +Subproject commit 0987e6cb7f415be17d1240c8cd71719f94a98f76 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 21558bce..152f6935 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 21558bcead96716607e670840c63213d6eb4d8c9 +Subproject commit 152f6935f050e83363f1b4f40c40af7f64ca5df9 diff --git a/qtwebchannel b/qtwebchannel index 05327921..c3574f4e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 05327921fd125a6e33cb32344ac54a7b023f8c62 +Subproject commit c3574f4ec36f3cab71fcb680e889afc8a16c6242 diff --git a/qtwebengine b/qtwebengine index ea65bb32..8990cb0f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ea65bb32fa988b37d030c3737b8a036f049d1354 +Subproject commit 8990cb0f91cdef917fb8ad92abc00774d073737e diff --git a/qtwebsockets b/qtwebsockets index dd00a38e..c8704b3d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff +Subproject commit c8704b3dbcfecd774244300943b1c63e2bf9841f diff --git a/qtwinextras b/qtwinextras index 4e5f9b48..b9456015 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 +Subproject commit b9456015d136ee2b6acef9b819d534729ad20cea diff --git a/qtx11extras b/qtx11extras index 11ee82ab..719d3c88 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 +Subproject commit 719d3c88670203fca21a3433b553bc2c1434a2ac diff --git a/qtxmlpatterns b/qtxmlpatterns index 595e7cf5..6feae569 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 595e7cf516be4667b41ed358eabafcbf2f23ef5c +Subproject commit 6feae569229fa391454b76450138ce83cf326046 -- cgit v1.2.3 From 8337e20fadddf7f9c3407f69e620f96d6c189685 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Apr 2019 15:47:13 +0000 Subject: Update submodules on '5.12.3' in qt5 Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtbase b/qtbase index a0b5d6e6..534df5a3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0b5d6e60f96359d88352e0b1c000678cdc80988 +Subproject commit 534df5a33bd6a3d0d00194212cf868a9ef57bd53 diff --git a/qtdeclarative b/qtdeclarative index 17884e1e..5ead393e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 17884e1e3c7c40cd104dceb9452dd2df6058c32d +Subproject commit 5ead393eba0fc9d7c05790887c53c3728b023195 diff --git a/qtdoc b/qtdoc index adaefd7c..38a19857 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a +Subproject commit 38a19857d7a1d80c81d5c0cb024aaf685c9f1afc diff --git a/qtgamepad b/qtgamepad index c6cb03e6..cf48d469 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c6cb03e61ed17c92b316ab0d6af86278c6abd45c +Subproject commit cf48d4694edd6a16cd3bf56922ab20d8bd6b7fe7 diff --git a/qtqa b/qtqa index 8a0c738d..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a0c738d9b4d4fe739714ae7a7fcea2a71581285 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtquickcontrols b/qtquickcontrols index 1edf84ef..718afd7c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f +Subproject commit 718afd7c3a78a35e3f4073dc6447e6bf3fda82d4 diff --git a/qtremoteobjects b/qtremoteobjects index 119b222d..043f7582 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 119b222dd5ee8f4410f87c5854e6e9ee65436309 +Subproject commit 043f7582bb2f611120a7693fbe75fa866d046fff diff --git a/qtserialbus b/qtserialbus index d5b3a2b6..9102ab86 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad +Subproject commit 9102ab868037042cab292dbfaa08f8dfff8ef5a8 diff --git a/qtspeech b/qtspeech index 5df003ab..45e7dd1e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5df003abcb564fef4074a73969d3ca3aaf8acf1d +Subproject commit 45e7dd1eee7ab2c2b26a429106e86f07dabfa4dc diff --git a/qtsvg b/qtsvg index 15f74a0f..fd12ae24 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 15f74a0f8a41759e1216d52d53852c05c9299107 +Subproject commit fd12ae24b4542cf2f0df1a34187c4b8c0a408e01 diff --git a/qttools b/qttools index 50335cb2..fe5b4f8e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 +Subproject commit fe5b4f8e7ac984cc4c9698e7d6def9be46b0df7a diff --git a/qtwayland b/qtwayland index 7a0956a8..e70a8070 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7a0956a89a559e5a73a659fcc08001cefa01d9bd +Subproject commit e70a8070ea1e7903221fb980ddf3c23f3e9b0836 diff --git a/qtwebengine b/qtwebengine index 8990cb0f..7ba379ec 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8990cb0f91cdef917fb8ad92abc00774d073737e +Subproject commit 7ba379ecfa575f871a52dc94c9f29e2bfdfc9865 diff --git a/qtwebview b/qtwebview index 8df88a17..05657f1c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e +Subproject commit 05657f1c4744123ff63306a56cb699f2cfbc9f92 -- cgit v1.2.3 From da9243a97bb3eadb01153fd0afe4b7ffd25839d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Apr 2019 23:31:03 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 7b4f9dbf..2a815855 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b4f9dbf270b6e3369da5f5c0187876dfad69e70 +Subproject commit 2a815855a9b91a3537ab3d804ad1ee47d741b64f diff --git a/qtconnectivity b/qtconnectivity index 8b643c80..72f3ad1d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8b643c80a81f4897e0a1ec6442820c60bbc802b1 +Subproject commit 72f3ad1dbe66ad4700417e6f681f92320e2fd183 diff --git a/qtdeclarative b/qtdeclarative index fe3e9110..95609960 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fe3e9110327f022daf676766ce04b8a0a147c7c9 +Subproject commit 956099608b98d8f57798f59c8f5367a476e2d5ae diff --git a/qtimageformats b/qtimageformats index b1d12f8c..83e8e25a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 +Subproject commit 83e8e25a6a3a94482088916be724d47620f4ea53 diff --git a/qtsvg b/qtsvg index d477ec8f..11c98582 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d477ec8f40b28caf3a216d9e8550d8871d5131fb +Subproject commit 11c985829493f3aed8e7894e5f9fdd44891ec249 diff --git a/qtwebengine b/qtwebengine index 89e5a7b1..1b7c7d85 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 89e5a7b1d874dda5b118017bfc6f16eee6a8493b +Subproject commit 1b7c7d853978d5a2ebc4ed06f4879c35bd68aa4f -- cgit v1.2.3 From 712d5447bf633d88acf1627b16649f88c458cc7e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Apr 2019 13:16:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 2a815855..5b3dfa47 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a815855a9b91a3537ab3d804ad1ee47d741b64f +Subproject commit 5b3dfa470ed7ea40103daa785286ab71fb7aa230 diff --git a/qtconnectivity b/qtconnectivity index 72f3ad1d..6aade961 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72f3ad1dbe66ad4700417e6f681f92320e2fd183 +Subproject commit 6aade96108f48d20382950aff5610e0df24e5616 diff --git a/qtdeclarative b/qtdeclarative index 95609960..398d586a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 956099608b98d8f57798f59c8f5367a476e2d5ae +Subproject commit 398d586a59e768f6e442fdc912d9180df71ff374 diff --git a/qtwebengine b/qtwebengine index 1b7c7d85..4f5380f4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1b7c7d853978d5a2ebc4ed06f4879c35bd68aa4f +Subproject commit 4f5380f413a8a5e89ee57f301a9d6010eac92ad4 -- cgit v1.2.3 From e72a082da5f90c9a450829fc9ab696aac1851b5e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:13:26 +0300 Subject: Provisioning: Remove MSVC 2015 update 3 patch from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi (cherry picked from commit b3e35cbac501c749cd17a48c8fc85ef6f8acbba7) Reviewed-by: Juha Karjalainen Reviewed-by: Jani Heikkinen --- .../10-msvc_2015_update3_patch.ps1 | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +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\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 12cde4e0da9e3e2f2143d55657b0c06385bc3cfb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 21 Apr 2019 23:30:50 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0 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 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/qt3d b/qt3d index 1fcdee0f..135bf830 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1fcdee0f313845f4e06b294cf520ab477191774b +Subproject commit 135bf830e67f5187de38b22fcdecb8992c3ef124 diff --git a/qtactiveqt b/qtactiveqt index 0a091107..8fb524d9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0a0911079d25b529b102fb2c4ba2de2cb45b9e5d +Subproject commit 8fb524d9d7abfb159b97cec48eddced867568cb9 diff --git a/qtandroidextras b/qtandroidextras index 5e920ecf..c5e4882e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 5e920ecff160ddf7374023802918385ad699d786 +Subproject commit c5e4882e75c37f2c0462141793dffc4fa6710fc4 diff --git a/qtbase b/qtbase index 5b3dfa47..2b2133f8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5b3dfa470ed7ea40103daa785286ab71fb7aa230 +Subproject commit 2b2133f85362325dbb7c0a8e73b8a4697128b5c4 diff --git a/qtcanvas3d b/qtcanvas3d index ad4ac1b1..9a7c0f06 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ad4ac1b1493cc637ab7280196a948fac9bef091e +Subproject commit 9a7c0f06fd375a1d7e07082338a4fa0cfc360751 diff --git a/qtcharts b/qtcharts index c0f0d22a..3e2e3cff 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c0f0d22a1ae85c7efafb4cee6d0e59effb68262c +Subproject commit 3e2e3cff3fd4dbfc73f964657e97281d2f9a6eb5 diff --git a/qtconnectivity b/qtconnectivity index 6aade961..3d0ac0c8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6aade96108f48d20382950aff5610e0df24e5616 +Subproject commit 3d0ac0c8e62e141f1e3300ac9b637d68bcc37ba7 diff --git a/qtdatavis3d b/qtdatavis3d index c71ab9eb..13c950f0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c +Subproject commit 13c950f006160b8aa8aae559fcbd75d7d4f9be11 diff --git a/qtdeclarative b/qtdeclarative index 398d586a..c018df5b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 398d586a59e768f6e442fdc912d9180df71ff374 +Subproject commit c018df5b4075ae962966d4df7653d476dab02840 diff --git a/qtdoc b/qtdoc index 7f427f73..bb513f33 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7f427f737798d1454ba92277f38a2783ce1b2cd0 +Subproject commit bb513f3342a043577e073510aecb94ed7aa4aafc diff --git a/qtgamepad b/qtgamepad index 8ecbb722..19ca9370 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8ecbb7227b5bf2da6887e5a4ec0c7c7012affb6e +Subproject commit 19ca9370409d82a00841372df2e8bc0bf35148e7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e7ab193d..9490960f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e7ab193d855806d7333577ad7d9d15165d1b5cf8 +Subproject commit 9490960f5fb4e56058f6b8c096617e94e9e5611d diff --git a/qtimageformats b/qtimageformats index 83e8e25a..29300088 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 83e8e25a6a3a94482088916be724d47620f4ea53 +Subproject commit 293000886199483ea63ccc5e71ac0bf1c3071a0e diff --git a/qtlocation b/qtlocation index 397a31b1..6c30ba11 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 397a31b187d537f81610007b7d0f6f69b306dfd4 +Subproject commit 6c30ba1141c60c271cab67bf12a7b78323bfdd45 diff --git a/qtmacextras b/qtmacextras index cc0df66a..576926d0 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit cc0df66a3e3ed4099fba96eeb287239405d49a19 +Subproject commit 576926d0608b1d37b88d56b8bf873aeb1c57d149 diff --git a/qtmultimedia b/qtmultimedia index c8716f68..21f75280 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c8716f68feb5a38473cbd54972b9a9f095e9e24d +Subproject commit 21f752806077e05249f9c357f14e9f0294920ecb diff --git a/qtnetworkauth b/qtnetworkauth index 88fa9ac9..effb9ec6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 88fa9ac94241a182f8ad92a692eccabbc0caa9cc +Subproject commit effb9ec6f5abfe50277de410769e7d8e01e6d97f diff --git a/qtpurchasing b/qtpurchasing index 634f8e54..9a451391 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 634f8e549291b96434941b1dc29d665fdf29f980 +Subproject commit 9a451391f077093307cc7f3ac8cee5a0f6a168fd diff --git a/qtquickcontrols b/qtquickcontrols index 1edf84ef..8c015b37 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f +Subproject commit 8c015b374b66c952ff43150f0ffcee433a9eb412 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bd126fde..cbb5abac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bd126fdea95ed994fdd35d50e445b45af75657ab +Subproject commit cbb5abac4245ffaff6547c95ad2d56846ef8dd0b diff --git a/qtscript b/qtscript index 2379c9b9..484e9de6 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2379c9b93792feb97d6cb871082aed0f7cbcbad8 +Subproject commit 484e9de6d86d011bd349890cba87a25554b0f672 diff --git a/qtscxml b/qtscxml index 554ac455..62c117ec 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 554ac4551c154f39de2917877b189b74e4464d3b +Subproject commit 62c117ec939dbcce5d190e3086d9f55c9db34f23 diff --git a/qtsensors b/qtsensors index 2c9fc2c1..ecebd931 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 +Subproject commit ecebd931d32e21ab743941e8ca34a543611f7ca7 diff --git a/qtserialbus b/qtserialbus index fc5e6011..b58c86ed 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fc5e6011c1af70bd47a77796a0d0ab0fcd186541 +Subproject commit b58c86eddd8fa3fb4a570c5aa2301b1278c4e13c diff --git a/qtserialport b/qtserialport index 0ab5636a..72a80def 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0ab5636aee10d8578307beb90c69e27f7f69574b +Subproject commit 72a80def162e7a3a56997c6080db58a9874a23b5 diff --git a/qtspeech b/qtspeech index 5df003ab..7529a900 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5df003abcb564fef4074a73969d3ca3aaf8acf1d +Subproject commit 7529a90059a72681ff106500ac64ce6c00e9b229 diff --git a/qtsvg b/qtsvg index 11c98582..99218c5f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 11c985829493f3aed8e7894e5f9fdd44891ec249 +Subproject commit 99218c5fc00d6124fdcef1a3e1954e658d10db28 diff --git a/qttranslations b/qttranslations index 0987e6cb..eb1ca400 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0987e6cb7f415be17d1240c8cd71719f94a98f76 +Subproject commit eb1ca4007acd3035d6793fc2fe75c33518c01ed0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 21558bce..cbe4912e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 21558bcead96716607e670840c63213d6eb4d8c9 +Subproject commit cbe4912e8751a8cf399243536f77bebf97117c9e diff --git a/qtwayland b/qtwayland index 0b512866..c53bcc3b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0b51286635ca3f724df94dd4d5268c950505f6ec +Subproject commit c53bcc3b2ec04db86f77e9b3d0d18cef2c6932a0 diff --git a/qtwebchannel b/qtwebchannel index 05327921..fc891dad 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 05327921fd125a6e33cb32344ac54a7b023f8c62 +Subproject commit fc891dad209725113f49f42cfd59a5ced6ff89d2 diff --git a/qtwebengine b/qtwebengine index 4f5380f4..c6fb532d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4f5380f413a8a5e89ee57f301a9d6010eac92ad4 +Subproject commit c6fb532d81f405b2456c382aa0b29eef8866f993 diff --git a/qtwebsockets b/qtwebsockets index dd00a38e..30794c67 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff +Subproject commit 30794c6737a1105bdcd840e41ff374ece3bc60e1 diff --git a/qtwebview b/qtwebview index 3c347ac6..d55be974 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3c347ac61ef444a0246921a58a51ccec6bab7413 +Subproject commit d55be9749b2dfc0e047da9e1d10a240923880a40 diff --git a/qtwinextras b/qtwinextras index 4e5f9b48..f68e9802 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 +Subproject commit f68e98026f6e37cf5db51e24bc90d3cf9be9d142 diff --git a/qtx11extras b/qtx11extras index 11ee82ab..94162337 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 +Subproject commit 941623379f15db113551e7e887b0af58da17865a diff --git a/qtxmlpatterns b/qtxmlpatterns index 595e7cf5..8db585da 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 595e7cf516be4667b41ed358eabafcbf2f23ef5c +Subproject commit 8db585da3bb29c51be9ec8f7b719157e494b174e -- cgit v1.2.3 From 766fc425e3a6ee50fa50c1be823b8602d846ad07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Apr 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 135bf830..c9d04727 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 135bf830e67f5187de38b22fcdecb8992c3ef124 +Subproject commit c9d047279713a86a32753c64c32eee75c70ddb9a diff --git a/qtbase b/qtbase index 2b2133f8..de854aa3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2b2133f85362325dbb7c0a8e73b8a4697128b5c4 +Subproject commit de854aa37f49de6d8f6ee12c0e9d247c5143c2da diff --git a/qtdoc b/qtdoc index bb513f33..039c7d8a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bb513f3342a043577e073510aecb94ed7aa4aafc +Subproject commit 039c7d8a843328402c48410eb1f94358455bf9ce diff --git a/qtremoteobjects b/qtremoteobjects index 119b222d..c4e5f629 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 119b222dd5ee8f4410f87c5854e6e9ee65436309 +Subproject commit c4e5f629c09d197c49fd1be59a8fdfeaba064c15 diff --git a/qttools b/qttools index 210fbd5f..97075ce4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 210fbd5f252da88d3ae7f191d5b987d793646712 +Subproject commit 97075ce49ee73609330804b8bbbc12fabbb30766 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cbe4912e..717a56c5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cbe4912e8751a8cf399243536f77bebf97117c9e +Subproject commit 717a56c54382942425a66e012f41782593e0444e diff --git a/qtwebengine b/qtwebengine index c6fb532d..73a0749f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c6fb532d81f405b2456c382aa0b29eef8866f993 +Subproject commit 73a0749fdae3afe3f42606895ac7c133b6f14425 -- cgit v1.2.3 From 65cf2cb95725b72bddf54ceb9ae13a01035e00ef Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 24 Apr 2019 13:39:30 +0300 Subject: Provisioning: Install Vulkan to Rhel 7.4 Enables Vulkan support at compile time Task-number: QTBUG-72763 Change-Id: If97adb030d50a147c9714afe3ef360291904b58a Reviewed-by: Laszlo Agocs Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index e86870c0..ed33e81a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -112,6 +112,8 @@ installPackages+=(xcb-util-renderutil-devel) # ODBC support installPackages+=(unixODBC-devel) installPackages+=(unixODBC) +# Vulkan support +installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" -- cgit v1.2.3 From 09f28e9e1d989a70c876138a4cf24e35c67e0fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 25 Apr 2019 15:26:37 +0300 Subject: Provisioning: Install python36-devel to rhel 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rhel Python3 system package is missing development libs. Fixes: PYSIDE-996 Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index ed33e81a..b956d6a3 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -70,6 +70,7 @@ installPackages+=(speech-dispatcher-devel) installPackages+=(python-devel python-pip) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) +installPackages+=(python36-devel) # WebEngine installPackages+=(bison) installPackages+=(flex) -- cgit v1.2.3 From 22bb88ed070dee20806faccaf3e2c1de47f955b9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 26 Apr 2019 07:46:02 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index c9d04727..fed848f7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c9d047279713a86a32753c64c32eee75c70ddb9a +Subproject commit fed848f7dcff99cf5adb3b7b45190826b3dcf898 diff --git a/qtbase b/qtbase index de854aa3..1d128ed1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit de854aa37f49de6d8f6ee12c0e9d247c5143c2da +Subproject commit 1d128ed1dfbcf49453ada922e54381c37264fde5 diff --git a/qtdeclarative b/qtdeclarative index c018df5b..6b6b3791 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c018df5b4075ae962966d4df7653d476dab02840 +Subproject commit 6b6b379135e5022a3425c3135cebb58fc0f3100e diff --git a/qtdoc b/qtdoc index 039c7d8a..5c1d8140 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 039c7d8a843328402c48410eb1f94358455bf9ce +Subproject commit 5c1d814079fbe77e4bd02c2a00385b891a371734 diff --git a/qtqa b/qtqa index 8c9be4c8..355763de 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 +Subproject commit 355763de979cd635078dfad20a075864dcc2284b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cbb5abac..5ca18a3f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cbb5abac4245ffaff6547c95ad2d56846ef8dd0b +Subproject commit 5ca18a3f21083151b771f0efa2a2605f183c8166 diff --git a/qtsvg b/qtsvg index 99218c5f..6292c75f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 99218c5fc00d6124fdcef1a3e1954e658d10db28 +Subproject commit 6292c75fb742f2877630ec22fb3a9b0d3afc9a96 diff --git a/qtwayland b/qtwayland index c53bcc3b..85bb158d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c53bcc3b2ec04db86f77e9b3d0d18cef2c6932a0 +Subproject commit 85bb158ddf08aca4d76c13c6a9fcd2637d84d3ea -- cgit v1.2.3 From d27f9e9b884ab8806fea97fdc87a4f20e1e4747d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 30 Apr 2019 06:38:12 +0000 Subject: Update submodules on '5.12' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8 Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 1d128ed1..3308a819 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d128ed1dfbcf49453ada922e54381c37264fde5 +Subproject commit 3308a81942d33f524b3fc61492bd67c4e2b9072d diff --git a/qtcharts b/qtcharts index 3e2e3cff..d7b03123 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3e2e3cff3fd4dbfc73f964657e97281d2f9a6eb5 +Subproject commit d7b0312363a868d1d50ef4af032b57a36d50b24d diff --git a/qtdeclarative b/qtdeclarative index 6b6b3791..f01e72a8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6b6b379135e5022a3425c3135cebb58fc0f3100e +Subproject commit f01e72a82b59c214ce4b0a6ecefb604bc66ddd3e diff --git a/qtlocation b/qtlocation index 6c30ba11..1e88a556 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6c30ba1141c60c271cab67bf12a7b78323bfdd45 +Subproject commit 1e88a55671d6514894a663bf207d783e85759781 diff --git a/qtscxml b/qtscxml index 62c117ec..80a9f4df 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 62c117ec939dbcce5d190e3086d9f55c9db34f23 +Subproject commit 80a9f4dfd078c4df1bc2c7fa279d637debfd672a diff --git a/qtsensors b/qtsensors index ecebd931..a4b7814e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ecebd931d32e21ab743941e8ca34a543611f7ca7 +Subproject commit a4b7814ec945b979bafdc6de60800bbddd4d240e diff --git a/qtserialbus b/qtserialbus index b58c86ed..673495d2 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b58c86eddd8fa3fb4a570c5aa2301b1278c4e13c +Subproject commit 673495d2eb1fe9cdf701351d75c2203c80ab6ba5 diff --git a/qttools b/qttools index 97075ce4..6c1ca200 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 97075ce49ee73609330804b8bbbc12fabbb30766 +Subproject commit 6c1ca200d52d671b1f33125d99d6e0cd6d469634 diff --git a/qttranslations b/qttranslations index eb1ca400..ebd5ad86 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit eb1ca4007acd3035d6793fc2fe75c33518c01ed0 +Subproject commit ebd5ad86ac35fc27e58489d1389abb6cacfb2b13 diff --git a/qtwebengine b/qtwebengine index 73a0749f..26ac59af 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 73a0749fdae3afe3f42606895ac7c133b6f14425 +Subproject commit 26ac59af2306b4f6f83e791bb3e828b9f7b1a721 -- cgit v1.2.3 From ea052ceb0ae5c5a53c1bfa038d6ff77ea0c8e4a9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 May 2019 11:02:35 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 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 +- 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 276be935..06f41f15 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 276be935bfeccde733bacd4267abeb978f6efda5 +Subproject commit 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 diff --git a/qtactiveqt b/qtactiveqt index 957cc79d..5c3a2a2d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 957cc79d4b5c36aa6b8dc99f73bd0b04b62d6898 +Subproject commit 5c3a2a2de9bc8c7d76afbc042f94b388b53ce896 diff --git a/qtandroidextras b/qtandroidextras index be8e722b..17985125 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit be8e722b492ec8c9c6480d68827b6ec0e83cc2d2 +Subproject commit 17985125ca974456900bca463b98a47af9ce4970 diff --git a/qtbase b/qtbase index 12b96dbb..ef05c488 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12b96dbb81a1a7bc5ffc08c24942038b007985e9 +Subproject commit ef05c48898e90e4ff40d8c4493f4b80bc22c1703 diff --git a/qtcharts b/qtcharts index beda274e..19fb5aa9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit beda274e7d8b5a6864b254a9e63b654f3c494139 +Subproject commit 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e9 diff --git a/qtconnectivity b/qtconnectivity index d37dbf77..b4c225c7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54 +Subproject commit b4c225c747d91122f7c145b337ad611c025c1ab6 diff --git a/qtdatavis3d b/qtdatavis3d index 7dc2d930..e4cd15e3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7dc2d9302347b87993f5cfed4be5d6b9c3e130bc +Subproject commit e4cd15e388f675a80a9c257655a580b1b53c240a diff --git a/qtdeclarative b/qtdeclarative index 8bc3329e..bb882f43 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8bc3329e2cec4638fa9af274a40dda176bbb7352 +Subproject commit bb882f433b6cf6fca56049df6b654fb6a39a7cab diff --git a/qtdoc b/qtdoc index 4fe4d966..c1c45f8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4fe4d9664eff32568ff03868fc0cbe8b81ee3278 +Subproject commit c1c45f8d8cfe67b2605baad2ab72a4ec43aef3ec diff --git a/qtgamepad b/qtgamepad index df36f287..653900f1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit df36f287894dca61486b6769866718688cce12f3 +Subproject commit 653900f1d4801f184ddd9725f0806406a4021b8b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 085275b9..fc823235 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 085275b92a55a21cbcf8d307a6f52804875deedd +Subproject commit fc82323538ffde51ab03a38db4d6e61b372a091e diff --git a/qtimageformats b/qtimageformats index 5fba8488..dabcde31 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5fba848889ade8eb067b8a54011e20e9d59b4738 +Subproject commit dabcde3195e47683b31f0050c5de067863eb64e5 diff --git a/qtlocation b/qtlocation index b392921e..a6ac8739 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b392921e33b4e8d425f1881afb95e6d34e53879c +Subproject commit a6ac8739a23c4101a3c582aa89281aa90027128f diff --git a/qtmacextras b/qtmacextras index 03dd40f8..1196b92a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 03dd40f8bf0bf7cf10830a9fe04de63c0fd95e63 +Subproject commit 1196b92a6428b22c56f1df3fc70337c02972d9d0 diff --git a/qtmultimedia b/qtmultimedia index d97d618a..95818e11 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d97d618a4884c2535ba787e774f0faa6bce82081 +Subproject commit 95818e11936e8c85172b2675132a535d5a45015c diff --git a/qtnetworkauth b/qtnetworkauth index cf5741a4..f52ff01d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit cf5741a44a6c337fa523080838d8e9220f4370c1 +Subproject commit f52ff01d38400d5343af9149414f3573580a2405 diff --git a/qtpurchasing b/qtpurchasing index 12c4da76..f9ab1500 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 12c4da762bd29399767538ca716189908e41cc5a +Subproject commit f9ab15009bdc249d4f19513fc9730d81f5b50fe5 diff --git a/qtqa b/qtqa index 8c9be4c8..604a768d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 +Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 diff --git a/qtquickcontrols b/qtquickcontrols index 3d444423..44fe49e5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3d44442331ba6f1ba7a5d5ad9f3834993911e288 +Subproject commit 44fe49e573539e22709c2d5c996f1ca9ee8fd760 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ced7d5af..e1a6475a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7 +Subproject commit e1a6475a2a3ea46b2afbc2f154c18b255466dad7 diff --git a/qtremoteobjects b/qtremoteobjects index cb9a20c5..e69037fe 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cb9a20c50584eaf950c1fc9a7fd7961a92100046 +Subproject commit e69037fe3160964d45920ee33d606ec2a72a6e3c diff --git a/qtrepotools b/qtrepotools index df3090cb..50529226 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 +Subproject commit 50529226884176e3910f84a68fb260a3cb9fb3b2 diff --git a/qtscript b/qtscript index 8d2c11ac..73296231 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 8d2c11ac2352556167dc4a86172cd9bc3a979ed8 +Subproject commit 732962319eeae2881890bd146146e7e6f486c9fb diff --git a/qtscxml b/qtscxml index acddb067..68c9234b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit acddb0676cafdc83edd08aee87181bf5602d6387 +Subproject commit 68c9234b67ca0939fcf6607d87bda90b93170567 diff --git a/qtsensors b/qtsensors index d1a1b629..299bbcdb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d1a1b62914d592bf0bb382accff29abc610d3fab +Subproject commit 299bbcdb59198910188ebe1abbae1d9868d8ae6d diff --git a/qtserialbus b/qtserialbus index fe80eef6..56211334 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fe80eef6b3377c8727c5190d275808c343ee7c75 +Subproject commit 562113342f2b232d38a3ea05e84b8d2584799218 diff --git a/qtserialport b/qtserialport index f47d1b9a..c1766c64 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f47d1b9a11eb8c56afbd929285724f795097da09 +Subproject commit c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 diff --git a/qtspeech b/qtspeech index c79b11cb..bda364fe 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c79b11cbf4eb6e72d32eb98a262201341018b620 +Subproject commit bda364fe3df7dd6269e2d284fcc2c6d239a962b7 diff --git a/qtsvg b/qtsvg index 2043a358..7e7ed705 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 +Subproject commit 7e7ed705efc51134b27820d76beceefc62ab0b3d diff --git a/qttools b/qttools index 1562cf0d..7203e6a9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1562cf0d6129886e16c57ac72fab00b309db6bc6 +Subproject commit 7203e6a94ced619eadbc14aedf73d40530671662 diff --git a/qttranslations b/qttranslations index 133f635a..a049a619 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 133f635a25ee58596fcb556b87e841257390758b +Subproject commit a049a619d2f0cbe6e57aaf50202b7ade244cf955 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 67e497ff..17b5efd7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 67e497ff407441515761b312599cb4ad6b61adad +Subproject commit 17b5efd7bfdcb6afedb2ba5fbe263a86efb570f9 diff --git a/qtwayland b/qtwayland index 458bc86f..8b69d52d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 458bc86f82f8fa6cfd659950549d1d2b36e5e40d +Subproject commit 8b69d52db792c3910be53321df44b5c57baa694c diff --git a/qtwebchannel b/qtwebchannel index 24e0c897..11c8706b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 24e0c897fac375514396191db7b582505028c918 +Subproject commit 11c8706b6c0ca3f9c0d195641fd0eea816899acd diff --git a/qtwebengine b/qtwebengine index 5de67028..b546cea1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5de670283e3093fcdd2a91dcca30ffbe0b03d230 +Subproject commit b546cea1b5ba6721bf7fcb687c6c069d4442ba34 diff --git a/qtwebsockets b/qtwebsockets index 74c8ebe9..142d9798 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 74c8ebe9696c981311f19bdd6544634ab1b7cc7f +Subproject commit 142d9798d262a41c09a9c43f3ae3a82c771fc800 diff --git a/qtwebview b/qtwebview index d8958299..159945f8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d895829904a1de3f8a63d5ab56e73106847fddcf +Subproject commit 159945f822e098d8d169ec1379675d8a664cea9e diff --git a/qtwinextras b/qtwinextras index 49d744be..1ec9cfb3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 49d744be877b2a4cba3e306c4ab0056687179318 +Subproject commit 1ec9cfb3379b40132f8d61a6b8b9145df4ac0a09 diff --git a/qtx11extras b/qtx11extras index 431bd11f..ce6b90e5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 431bd11f304179c77f55edd07d68b02d8408a45c +Subproject commit ce6b90e597e93252a56d37e616fbd473e1ae8c33 diff --git a/qtxmlpatterns b/qtxmlpatterns index c886d992..9cfa05ed 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c886d992029740da0185fd2bf8a040c84156e73d +Subproject commit 9cfa05ed8beb0a9f323070060115e56064be9f3a -- cgit v1.2.3 From 6465c421225574dc1c5d9f23293c37e784fd1b02 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 13 Feb 2019 13:06:27 +0200 Subject: Provisioning: install msys2 Windows need msys2 perl for configuring openssl 1.1.1 for android. Task-number: QTQAINFRA-2327 Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-msys2.ps1 | 70 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/10-install-msys2.ps1 | 1 + 2 files changed, 71 insertions(+) create mode 100644 coin/provisioning/common/windows/install-msys2.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 new file mode 100644 index 00000000..0c4a9680 --- /dev/null +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -0,0 +1,70 @@ +############################################################################ +## +## Copyright (C) 2019 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 installs 7-Zip + +$version = "20181211" +$prog = "msys2" +if (Is64BitWinHost) { + $arch = "x86_64" + $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" + $folder = "msys64" +} else { + $arch = "i686" + $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" + $folder = "msys32" +} +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" + + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$url_official = "http://repo.msys2.org/distrib/$arch/$package" +$PackagePath = "C:\Windows\Temp\$package" +$TargetLocation = "C:\Utils" + + +Download $url_official $url_cache $PackagePath +Verify-Checksum $PackagePath $sha1 +Extract-tar_gz $PackagePath $TargetLocation +$msys = "$TargetLocation\$folder\msys2_shell.cmd" + +# install perl +Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +Write-Host "Cleaning $PackagePath.." +Remove-Item -Recurse -Force -Path "$PackagePath" + +Write-Output "7-Zip = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 new file mode 100644 index 00000000..be9a3634 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" -- cgit v1.2.3 From c2506b0f9c1fff91947176ff43b977d60bb5d0aa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 May 2019 22:31:07 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index ef05c488..166889dd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ef05c48898e90e4ff40d8c4493f4b80bc22c1703 +Subproject commit 166889ddcbaac91c403a840f138f25bc2907b68c diff --git a/qtwebengine b/qtwebengine index b546cea1..46ac6474 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b546cea1b5ba6721bf7fcb687c6c069d4442ba34 +Subproject commit 46ac6474ea4f5592863dbcb295e53080b2e56086 -- cgit v1.2.3 From c6b018a9257a67b4229f07379b6caf7c4971662a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 6 May 2019 08:54:58 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 06f41f15..e9642824 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 +Subproject commit e9642824244fa9fe55dca2cef8e002192a4f1b17 diff --git a/qtactiveqt b/qtactiveqt index 5c3a2a2d..21a27816 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5c3a2a2de9bc8c7d76afbc042f94b388b53ce896 +Subproject commit 21a27816e66c8bea33b3ee28221df4b0c6ee9baf diff --git a/qtbase b/qtbase index 166889dd..e4e5a1f0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 166889ddcbaac91c403a840f138f25bc2907b68c +Subproject commit e4e5a1f0b7f85b4c8b593a06a67d83f5be09004e diff --git a/qtmultimedia b/qtmultimedia index 95818e11..268d78ca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 95818e11936e8c85172b2675132a535d5a45015c +Subproject commit 268d78ca745bf7d54545e51a4f22e2fa24a8675c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e1a6475a..324ec97a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e1a6475a2a3ea46b2afbc2f154c18b255466dad7 +Subproject commit 324ec97aa256549c56d506fd96c1e06c35fed1ae diff --git a/qtrepotools b/qtrepotools index 50529226..a2e59d28 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 50529226884176e3910f84a68fb260a3cb9fb3b2 +Subproject commit a2e59d2879f1071fca7345e5888927cdcc64c9a0 diff --git a/qttools b/qttools index 7203e6a9..0f92411b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7203e6a94ced619eadbc14aedf73d40530671662 +Subproject commit 0f92411b53d653b0285f7c8919b2a682808167e5 diff --git a/qttranslations b/qttranslations index a049a619..88266670 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a049a619d2f0cbe6e57aaf50202b7ade244cf955 +Subproject commit 88266670663256f40019e7163092e17401557d5f diff --git a/qtwayland b/qtwayland index 8b69d52d..35766558 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8b69d52db792c3910be53321df44b5c57baa694c +Subproject commit 35766558ae55fb6b72b9fe640702c950832ca8c2 diff --git a/qtwebengine b/qtwebengine index 46ac6474..c453b750 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 46ac6474ea4f5592863dbcb295e53080b2e56086 +Subproject commit c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 -- cgit v1.2.3 From 049eb21a1d6af9c95b1a2b7a33a134dc6abc5433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 25 Feb 2019 15:38:50 +0200 Subject: Replace RHEL 7.4 with 7.6 in the CI Task-number: QTQAINFRA-2942 Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +- coin/platform_configs/qt3d-runtime.txt | 6 +- coin/platform_configs/qt5.txt | 6 +- .../01-disable-mlocate.sh | 4 - .../01-refresh-subscription-manager.sh | 43 ------- .../qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 52 -------- .../qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 76 ------------ .../03-install-devtoolset.sh | 41 ------- .../03-install-rhel-epel.sh | 51 -------- .../04-install-packages.sh | 134 --------------------- .../qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 46 ------- .../qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 6 - .../qtci-linux-RHEL-7.4-x86_64/06-cmake.sh | 43 ------- .../qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh | 39 ------ .../qtci-linux-RHEL-7.4-x86_64/08-integrity.sh | 39 ------ .../09-disable_selinux.sh | 39 ------ .../10-openssl_for_android_linux.sh | 43 ------- .../qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh | 37 ------ .../qtci-linux-RHEL-7.4-x86_64/30-fbx.sh | 6 - .../qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 76 ------------ .../35-install-breakpad.sh | 6 - .../qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh | 39 ------ .../60-install_protobuff.sh | 40 ------ .../qtci-linux-RHEL-7.4-x86_64/90-squish.sh | 4 - .../qtci-linux-RHEL-7.4-x86_64/99-version.sh | 48 -------- .../01-disable-mlocate.sh | 4 + .../01-refresh-subscription-manager.sh | 43 +++++++ .../qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh | 52 ++++++++ .../qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh | 76 ++++++++++++ .../03-install-devtoolset.sh | 41 +++++++ .../03-install-rhel-epel.sh | 51 ++++++++ .../04-install-packages.sh | 134 +++++++++++++++++++++ .../qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh | 46 +++++++ .../qtci-linux-RHEL-7.6-x86_64/05-libclang.sh | 6 + .../qtci-linux-RHEL-7.6-x86_64/06-cmake.sh | 43 +++++++ .../qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh | 39 ++++++ .../qtci-linux-RHEL-7.6-x86_64/08-integrity.sh | 39 ++++++ .../09-disable_selinux.sh | 39 ++++++ .../10-openssl_for_android_linux.sh | 43 +++++++ .../qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh | 37 ++++++ .../qtci-linux-RHEL-7.6-x86_64/30-fbx.sh | 6 + .../qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh | 76 ++++++++++++ .../35-install-breakpad.sh | 6 + .../qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh | 39 ++++++ .../60-install_protobuff.sh | 40 ++++++ .../qtci-linux-RHEL-7.6-x86_64/90-squish.sh | 4 + .../qtci-linux-RHEL-7.6-x86_64/99-version.sh | 48 ++++++++ 47 files changed, 923 insertions(+), 923 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 29a20a07..177d9aa6 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,17 +12,17 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo +qtci-linux-RHEL-7.6-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh deleted file mode 100755 index 84238ebf..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 -ex - -# refresh local certificates -sudo subscription-manager refresh - -# Attach available subscriptions to system. This is needed when subscriptions are renewed. -sudo subscription-manager attach --auto - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh deleted file mode 100755 index c0f94a49..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/network_test_server_ip.txt -source "$BASEDIR/../common/shared/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/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh deleted file mode 100755 index 548cb9ca..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf -sudo systemctl stop packagekit -sudo systemctl disable packagekit - -sudo subscription-manager config --rhsm.manage_repos=0 -sudo subscription-manager refresh - -sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/.bashrc - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh deleted file mode 100755 index 5cdf7df0..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 -ex - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -package="epel-release-7-11.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" -rm "$targetFile" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh deleted file mode 100755 index b956d6a3..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -# Remove update notifications and packagekit running in the background -sudo yum -y remove PackageKit gnome-software - -installPackages=() -installPackages+=(git) -installPackages+=(zlib-devel) -installPackages+=(glib2-devel) -installPackages+=(openssl-devel) -installPackages+=(freetype-devel) -installPackages+=(fontconfig-devel) -# EGL support -installPackages+=(mesa-libEGL-devel) -installPackages+=(mesa-libGL-devel) -installPackages+=(libxkbfile-devel) -# Xinput2 -installPackages+=(libXi-devel) -installPackages+=(mysql-server) -installPackages+=(mysql) -installPackages+=(mysql-devel) -installPackages+=(postgresql-devel) -installPackages+=(cups-devel) -installPackages+=(dbus-devel) -# gstreamer 1 for QtMultimedia -installPackages+=(gstreamer1-devel) -installPackages+=(gstreamer1-plugins-base-devel) -# gtk3 style for QtGui/QStyle -installPackages+=(gtk3-devel) -# libusb1 for tqtc-boot2qt/qdb -installPackages+=(libusbx-devel) -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux -installPackages+=(speech-dispatcher-devel) -# Python 2 devel and pip. python-pip requires the EPEL repository to be added -installPackages+=(python-devel python-pip) -# Python 3 with python-devel, pip and virtualenv -installPackages+=(rh-python36) -installPackages+=(python36-devel) -# WebEngine -installPackages+=(bison) -installPackages+=(flex) -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 -installPackages+=(perl-Digest-SHA) -# INTEGRITY requirements -installPackages+=(glibc.i686) -# Enable Qt Bluetooth -installPackages+=(bluez-libs-devel) -# QtWebKit -installPackages+=(libxml2-devel) -installPackages+=(libxslt-devel) -# For building Wayland from source -installPackages+=(libffi-devel) -# QtWayland -installPackages+=(mesa-libwayland-egl) -installPackages+=(mesa-libwayland-egl-devel) -installPackages+=(libwayland-client) -installPackages+=(libwayland-cursor) -installPackages+=(libwayland-server) -# Jenkins -installPackages+=(chrpath) -# libxkbcommon -installPackages+=(libxkbcommon-devel) -installPackages+=(libxkbcommon-x11-devel) -# xcb-util-* libraries -installPackages+=(xcb-util-devel) -installPackages+=(xcb-util-image-devel) -installPackages+=(xcb-util-keysyms-devel) -installPackages+=(xcb-util-wm-devel) -installPackages+=(xcb-util-renderutil-devel) -# ODBC support -installPackages+=(unixODBC-devel) -installPackages+=(unixODBC) -# Vulkan support -installPackages+=(vulkan-devel) - -sudo yum -y install "${installPackages[@]}" - -sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 -sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 -# We shouldn't use yum to install virtualenv. The one found from package repo is not -# working, but we can use installed pip -sudo pip install --upgrade pip -sudo pip install virtualenv wheel - -sudo /usr/local/bin/pip3 install wheel -# Install all needed packages in a special wheel cache directory -/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh deleted file mode 100755 index 45565766..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -name="p7zip" -version="7-11" -sudo yum -y install "$name" - -# 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 - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh deleted file mode 100755 index 7074cbc1..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh deleted file mode 100755 index 062b2790..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/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 installs CMake 3.6.2 - -set -ex - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/linux/cmake_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh deleted file mode 100755 index 92c741fb..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh deleted file mode 100755 index 154370da..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/integrity.sh -source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh deleted file mode 100755 index b7a53cd4..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/disable_selinux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh deleted file mode 100755 index ef2b3ba8..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/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$ -## -############################################################################# -set +e - -# shellcheck disable=SC1091 -source /opt/rh/devtoolset-4/enable - -set -ex - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh deleted file mode 100755 index e677427f..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh deleted file mode 100755 index d8df4375..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh deleted file mode 100755 index 7c4d46dd..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -set -ex - -# This script will install ICU - -icuVersion="56.1" -icuLocation="/usr/lib64" -sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" -baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" - -sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" -develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" -develPackageExternalURL="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) -DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" -sudo 7z x -y -o/usr/lib64 "$targetFile" -sudo rm "$targetFile" - -echo "Installing custom ICU devel packages on RHEL" - -tempDir=$(mktemp -d) - -targetFile=$(mktemp) -DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" -7z x -y -o"$tempDir" "$targetFile" - -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/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh deleted file mode 100644 index 74dd1579..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/unix/install-breakpad.sh -source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh deleted file mode 100755 index a6c4dfff..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh deleted file mode 100755 index a77938b3..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 -ex - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh deleted file mode 100755 index 03565da2..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 needs to be called last during provisioning so that the software information will show up last in provision log. - -# Storage installed RPM packages information - -set -ex - -# shellcheck disable=SC2129 -echo "*********************************************" >> ~/versions.txt -echo "***** All installed RPM packages *****" >> ~/versions.txt -rpm -q -a | sort >> ~/versions.txt -echo "*********************************************" >> ~/versions.txt - -"$(dirname "$0")/../common/linux/version.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh new file mode 100755 index 00000000..f12cff1e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +# shellcheck source=../common/linux/disable-mlocate.sh +"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh new file mode 100755 index 00000000..84238ebf --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +# refresh local certificates +sudo subscription-manager refresh + +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..c0f94a49 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh @@ -0,0 +1,52 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/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.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh new file mode 100755 index 00000000..548cb9ca --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -0,0 +1,76 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf +sudo systemctl stop packagekit +sudo systemctl disable packagekit + +sudo subscription-manager config --rhsm.manage_repos=0 +sudo subscription-manager refresh + +sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/.bashrc + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh new file mode 100755 index 00000000..5cdf7df0 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +package="epel-release-7-11.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" +rm "$targetFile" + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh new file mode 100755 index 00000000..b956d6a3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -0,0 +1,134 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +# Remove update notifications and packagekit running in the background +sudo yum -y remove PackageKit gnome-software + +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) +# EGL support +installPackages+=(mesa-libEGL-devel) +installPackages+=(mesa-libGL-devel) +installPackages+=(libxkbfile-devel) +# Xinput2 +installPackages+=(libXi-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) +# gstreamer 1 for QtMultimedia +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) +# gtk3 style for QtGui/QStyle +installPackages+=(gtk3-devel) +# libusb1 for tqtc-boot2qt/qdb +installPackages+=(libusbx-devel) +# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +installPackages+=(speech-dispatcher-devel) +# Python 2 devel and pip. python-pip requires the EPEL repository to be added +installPackages+=(python-devel python-pip) +# Python 3 with python-devel, pip and virtualenv +installPackages+=(rh-python36) +installPackages+=(python36-devel) +# WebEngine +installPackages+=(bison) +installPackages+=(flex) +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 +installPackages+=(perl-Digest-SHA) +# INTEGRITY requirements +installPackages+=(glibc.i686) +# Enable Qt Bluetooth +installPackages+=(bluez-libs-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) +# For building Wayland from source +installPackages+=(libffi-devel) +# QtWayland +installPackages+=(mesa-libwayland-egl) +installPackages+=(mesa-libwayland-egl-devel) +installPackages+=(libwayland-client) +installPackages+=(libwayland-cursor) +installPackages+=(libwayland-server) +# Jenkins +installPackages+=(chrpath) +# libxkbcommon +installPackages+=(libxkbcommon-devel) +installPackages+=(libxkbcommon-x11-devel) +# xcb-util-* libraries +installPackages+=(xcb-util-devel) +installPackages+=(xcb-util-image-devel) +installPackages+=(xcb-util-keysyms-devel) +installPackages+=(xcb-util-wm-devel) +installPackages+=(xcb-util-renderutil-devel) +# ODBC support +installPackages+=(unixODBC-devel) +installPackages+=(unixODBC) +# Vulkan support +installPackages+=(vulkan-devel) + +sudo yum -y install "${installPackages[@]}" + +sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 +sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 +# We shouldn't use yum to install virtualenv. The one found from package repo is not +# working, but we can use installed pip +sudo pip install --upgrade pip +sudo pip install virtualenv wheel + +sudo /usr/local/bin/pip3 install wheel +# Install all needed packages in a special wheel cache directory +/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh new file mode 100755 index 00000000..45565766 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh @@ -0,0 +1,46 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +name="p7zip" +version="7-11" +sudo yum -y install "$name" + +# 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 + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh new file mode 100755 index 00000000..7074cbc1 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh new file mode 100755 index 00000000..062b2790 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh @@ -0,0 +1,43 @@ +#!/usr/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 installs CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh new file mode 100755 index 00000000..92c741fb --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh @@ -0,0 +1,39 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/qnx_700.sh +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh new file mode 100755 index 00000000..154370da --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh @@ -0,0 +1,39 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/integrity.sh +source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh new file mode 100755 index 00000000..b7a53cd4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh @@ -0,0 +1,39 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/disable_selinux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh new file mode 100755 index 00000000..ef2b3ba8 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh @@ -0,0 +1,43 @@ +#!/usr/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$ +## +############################################################################# +set +e + +# shellcheck disable=SC1091 +source /opt/rh/devtoolset-4/enable + +set -ex + +# shellcheck source=../common/linux/openssl_for_android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/usr/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$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh new file mode 100755 index 00000000..d8df4375 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh new file mode 100755 index 00000000..7c4d46dd --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="56.1" +icuLocation="/usr/lib64" +sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" + +sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageExternalURL="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) +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o/usr/lib64 "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on RHEL" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +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.6-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh new file mode 100755 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh new file mode 100755 index 00000000..a6c4dfff --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh @@ -0,0 +1,39 @@ +#!/usr/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" -- cgit v1.2.3