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 3436df53cf39da86a3ece99e1e9dccb7bc1749d0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Apr 2019 13:19:28 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I4b003f32744fbf25b6439b555a01ee130d50467e Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtwayland | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 63e88f60..12b96dbb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 63e88f60a769f2535945db0e1cabb9815ff45a77 +Subproject commit 12b96dbb81a1a7bc5ffc08c24942038b007985e9 diff --git a/qtconnectivity b/qtconnectivity index ae7bcf5f..d37dbf77 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ae7bcf5f5c3f3a227ddfacbf1178f3e791199455 +Subproject commit d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54 diff --git a/qtdeclarative b/qtdeclarative index 75998b22..8bc3329e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 75998b22b0b216d925e93d2c0e205025c23b2522 +Subproject commit 8bc3329e2cec4638fa9af274a40dda176bbb7352 diff --git a/qtdoc b/qtdoc index 256e0b4a..4fe4d966 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 256e0b4ab4181cc0eb3a8ddde4d464b98e6be16a +Subproject commit 4fe4d9664eff32568ff03868fc0cbe8b81ee3278 diff --git a/qtgamepad b/qtgamepad index eb5cd84d..df36f287 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit eb5cd84d1fb2d602f2de8a7013498012b6b58d80 +Subproject commit df36f287894dca61486b6769866718688cce12f3 diff --git a/qtimageformats b/qtimageformats index 86872a18..5fba8488 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 86872a1846ce622bb5f305a75a20939ac145122f +Subproject commit 5fba848889ade8eb067b8a54011e20e9d59b4738 diff --git a/qtmultimedia b/qtmultimedia index d55edfc3..d97d618a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d55edfc3cf6b65949835586b4b216cfd672c8380 +Subproject commit d97d618a4884c2535ba787e774f0faa6bce82081 diff --git a/qttools b/qttools index d92b976f..1562cf0d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d92b976f7d092a31c67edc2c515ac2444cd2808d +Subproject commit 1562cf0d6129886e16c57ac72fab00b309db6bc6 diff --git a/qtwayland b/qtwayland index 1b773df9..458bc86f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1b773df93f5bccb6b616d2a228cb15cffe8e32d5 +Subproject commit 458bc86f82f8fa6cfd659950549d1d2b36e5e40d -- 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 a41e568a780ab33e5f3823a1f8a06d47fd9099ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 May 2019 23:31:08 +0200 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: Ie7ea68d3f32ca9348ca7f5f7017f6e86c00b860d Reviewed-by: Tony Sarajärvi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index fed848f7..6f80588b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fed848f7dcff99cf5adb3b7b45190826b3dcf898 +Subproject commit 6f80588bb7be82117b0d2406a61bda9ca6dfbec3 diff --git a/qtactiveqt b/qtactiveqt index 8fb524d9..d3e71010 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8fb524d9d7abfb159b97cec48eddced867568cb9 +Subproject commit d3e7101032aa8c870fe4eda8ea5abe5bbfe4712e diff --git a/qtbase b/qtbase index 3308a819..83347e2d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3308a81942d33f524b3fc61492bd67c4e2b9072d +Subproject commit 83347e2d39dd967b6889977eddf77a18ff655ccc diff --git a/qtdeclarative b/qtdeclarative index f01e72a8..4a484211 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f01e72a82b59c214ce4b0a6ecefb604bc66ddd3e +Subproject commit 4a4842118d2303a8d851d1d8b85fe182d3fe492a diff --git a/qtlocation b/qtlocation index 1e88a556..4d3183c6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1e88a55671d6514894a663bf207d783e85759781 +Subproject commit 4d3183c6ca22203a75e29af601b4c407231eaab4 diff --git a/qtmultimedia b/qtmultimedia index 21f75280..6e6871ad 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 21f752806077e05249f9c357f14e9f0294920ecb +Subproject commit 6e6871ad398318d61840705de9d057d8eb7726f5 diff --git a/qtqa b/qtqa index 355763de..604a768d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 355763de979cd635078dfad20a075864dcc2284b +Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5ca18a3f..9310d5fb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5ca18a3f21083151b771f0efa2a2605f183c8166 +Subproject commit 9310d5fb5285ae5eb4b94c01606791319b775b85 diff --git a/qtremoteobjects b/qtremoteobjects index c4e5f629..c96a4193 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c4e5f629c09d197c49fd1be59a8fdfeaba064c15 +Subproject commit c96a4193e5d4d46804e8a11fad3b0e95d02b037b diff --git a/qtrepotools b/qtrepotools index df3090cb..64abf60a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 +Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c diff --git a/qtserialport b/qtserialport index 72a80def..574098ec 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 72a80def162e7a3a56997c6080db58a9874a23b5 +Subproject commit 574098ec0d928d8eb02cf997318c0168952297e9 diff --git a/qtwayland b/qtwayland index 85bb158d..c1b65146 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 85bb158ddf08aca4d76c13c6a9fcd2637d84d3ea +Subproject commit c1b65146f6b9ad98edea424742f7594712758377 diff --git a/qtwebengine b/qtwebengine index 26ac59af..efee223d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 26ac59af2306b4f6f83e791bb3e828b9f7b1a721 +Subproject commit efee223d7ff6e0e30fb9d9dff1536936922d4a03 diff --git a/qtxmlpatterns b/qtxmlpatterns index 8db585da..25a313cc 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8db585da3bb29c51be9ec8f7b719157e494b174e +Subproject commit 25a313cc7af41c2c63231499c49cc1f3e382e019 -- cgit v1.2.3 From 8f073cea69dde52b66577de4417fbc34db9e7476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 29 Apr 2019 12:18:48 +0300 Subject: Do DeveloperBuild for Boot2Qt Task-number: QTBUG-63152 Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 4 ++-- coin/platform_configs/qtbase.txt | 2 -- coin/platform_configs/qtdeclarative.txt | 4 ---- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 coin/platform_configs/qtdeclarative.txt diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 3959e24a..cf6ec311 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -21,8 +21,8 @@ qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang 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-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 armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild 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 diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index aaac89d0..15eb3b59 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,7 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index e2b69559..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index 1c856c0c..c9daf834 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -90,3 +90,9 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt + +# List qt user in qemu toolchain sysroots +sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group" +sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group" -- cgit v1.2.3 From 94d140b7466fe02f4a55c726ee116653cf7ac9cc Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 15:25:35 +0200 Subject: Log more version information on macOS provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Logs more version information to make easier to reproduce build. Logs macOS build version, homebrew installed packages and apple's installer installed packages. Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/macos-version.sh | 53 ++++++++++++++++++++++ coin/provisioning/common/macos/version.sh | 43 ++++++++++++++++++ .../qtci-macos-10.12-x86_64/99-mac-version.sh | 6 +++ .../qtci-macos-10.13-x86_64/99-mac-version.sh | 6 +++ 4 files changed, 108 insertions(+) create mode 100755 coin/provisioning/common/macos/macos-version.sh create mode 100755 coin/provisioning/common/macos/version.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh new file mode 100755 index 00000000..9f357b8c --- /dev/null +++ b/coin/provisioning/common/macos/macos-version.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 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. + +set -ex + +# Print all build machines versions to provision log +echo "*********************************************" >> ~/versions.txt +echo "***** macOS version *****" >> ~/versions.txt +sw_vers >> ~/versions.txt +echo "***** All installed packages *****" >> ~/versions.txt +echo "***** HomeBrew *****" >> ~/versions.txt +brew list --versions >> ~/versions.txt +echo "***** HomeBrew Casks*****" >> ~/versions.txt +brew cask list --versions >> ~/versions.txt +echo "***** Apple's installer *****" >> ~/versions.txt +pkgutil --pkgs >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/version.sh" diff --git a/coin/provisioning/common/macos/version.sh b/coin/provisioning/common/macos/version.sh new file mode 100755 index 00000000..3e2a7f19 --- /dev/null +++ b/coin/provisioning/common/macos/version.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 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 will print all installed software to provision log. +# Script needs to be named so that it will be ran at last during provisioning + +# Print all build machines versions to provision log +echo "*********************************************" +echo "***** SW VERSIONS *****" +cat ~/versions.txt +echo "*********************************************" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh new file mode 100755 index 00000000..99d94150 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/macos-version.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh new file mode 100755 index 00000000..99d94150 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/macos-version.sh -- cgit v1.2.3 From 56134fd7f66e9c05ec564620f6abba03af298f9a Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Wed, 6 Feb 2019 13:25:44 +0200 Subject: Remove Packaging feature flag from UWP 2015 x86 integrations UWP 2015 x86 binaries are not published anymore. Speed-up export tool and reduce exported data disk space consumption by removing Packaging feature flag from UWP 2015 x86 configurations. Task-number: QTBUG-73544 Change-Id: Iad2016b6e6aec1787c7bbf31c6ef6f71db905c21 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index cf6ec311..da452401 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -4,7 +4,7 @@ qtci-windows-10-x86_64-10 MSVC2015 qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples -- cgit v1.2.3 From 7e0fe78315cde30f8431dfd121c6658817d26cae Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 3 May 2019 12:44:12 +0300 Subject: Add static build for Saferenderer Task-number: COIN-229 Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5 Reviewed-by: Tuomas Heimonen Reviewed-by: Aapo Keskimolo --- coin/platform_configs/qtsaferenderer.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index ec14f610..5158b45a 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,3 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples Static +qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static -- cgit v1.2.3 From 3897888655570f2a43f3b9a7ceaf7f102501cb0d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 May 2019 18:01:32 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ib9074112780183225f5620edb3d02fa60f3af4c9 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 6f80588b..1a75f9b0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6f80588bb7be82117b0d2406a61bda9ca6dfbec3 +Subproject commit 1a75f9b07148042803d4366a8a21d6f2d62deee5 diff --git a/qtbase b/qtbase index 83347e2d..1f04b094 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 83347e2d39dd967b6889977eddf77a18ff655ccc +Subproject commit 1f04b0944633fd526585ee76d211ef7792810821 diff --git a/qtconnectivity b/qtconnectivity index 3d0ac0c8..14b0efe1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3d0ac0c8e62e141f1e3300ac9b637d68bcc37ba7 +Subproject commit 14b0efe1d4e5addec5f577a2d01a3a0d9a1d931b diff --git a/qtdeclarative b/qtdeclarative index 4a484211..2f447985 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4a4842118d2303a8d851d1d8b85fe182d3fe492a +Subproject commit 2f4479857d2b68f8cd3267b2f2b3c652ada431ed diff --git a/qtdoc b/qtdoc index 5c1d8140..31beb249 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5c1d814079fbe77e4bd02c2a00385b891a371734 +Subproject commit 31beb2498da41b21b718cccc622b5cb8045e97bc diff --git a/qtimageformats b/qtimageformats index 29300088..626c3053 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 293000886199483ea63ccc5e71ac0bf1c3071a0e +Subproject commit 626c3053efd7905080ac4a65fca55551391a36e3 diff --git a/qtlocation b/qtlocation index 4d3183c6..0e64148b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4d3183c6ca22203a75e29af601b4c407231eaab4 +Subproject commit 0e64148b39ab7e7417d9d115ddc53631167989b1 diff --git a/qtmultimedia b/qtmultimedia index 6e6871ad..7a4478a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e6871ad398318d61840705de9d057d8eb7726f5 +Subproject commit 7a4478a4a411df9f21e1499d2301049f9045b7d6 diff --git a/qtqa b/qtqa index 604a768d..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtquickcontrols b/qtquickcontrols index 8c015b37..84fbb488 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8c015b374b66c952ff43150f0ffcee433a9eb412 +Subproject commit 84fbb48832e984c7fce1c4091adb0d340974a75f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9310d5fb..4259e99c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9310d5fb5285ae5eb4b94c01606791319b775b85 +Subproject commit 4259e99c1990dc88632b85d945e9093cca47a831 diff --git a/qtremoteobjects b/qtremoteobjects index c96a4193..ff04810b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c96a4193e5d4d46804e8a11fad3b0e95d02b037b +Subproject commit ff04810bd09d3897ccede880680dd94fcf585171 diff --git a/qtsensors b/qtsensors index a4b7814e..14b5821f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a4b7814ec945b979bafdc6de60800bbddd4d240e +Subproject commit 14b5821f7b9998c1263c592d2cc70f21f1e72981 diff --git a/qttools b/qttools index 6c1ca200..1e267143 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c1ca200d52d671b1f33125d99d6e0cd6d469634 +Subproject commit 1e2671435fb828f088e6ca034a8724991907389f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 717a56c5..a826da7d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 717a56c54382942425a66e012f41782593e0444e +Subproject commit a826da7d9bee9bd96c84ceaba5f102f66fc538cd diff --git a/qtwebchannel b/qtwebchannel index fc891dad..14661300 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fc891dad209725113f49f42cfd59a5ced6ff89d2 +Subproject commit 1466130070922a6cc55c2a5b724311780a394a13 diff --git a/qtwebengine b/qtwebengine index efee223d..d9643a01 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit efee223d7ff6e0e30fb9d9dff1536936922d4a03 +Subproject commit d9643a016abc743db1dd879e7622cd27f88ff392 diff --git a/qtwebview b/qtwebview index d55be974..460ba5ff 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d55be9749b2dfc0e047da9e1d10a240923880a40 +Subproject commit 460ba5ff499b59904139bd6fd6ecf24d04e403f0 -- cgit v1.2.3 From 1f80c520dfd4dd2d22baa15ec4bc8b67159459c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 May 2019 15:42:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I6a580364ce78fdb792eab228d4ace789fb6e5c25 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 1a75f9b0..08b40b9b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1a75f9b07148042803d4366a8a21d6f2d62deee5 +Subproject commit 08b40b9be75242505a773dc5b2a96a5ef481d6e6 diff --git a/qtbase b/qtbase index 1f04b094..48f7f65d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1f04b0944633fd526585ee76d211ef7792810821 +Subproject commit 48f7f65dc34a9ef97d6b4cbca5fc251a7127f1a9 diff --git a/qtconnectivity b/qtconnectivity index 14b0efe1..d67ca376 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 14b0efe1d4e5addec5f577a2d01a3a0d9a1d931b +Subproject commit d67ca376b2111717de88596888f315fba05ef9c3 diff --git a/qtdeclarative b/qtdeclarative index 2f447985..3e716029 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2f4479857d2b68f8cd3267b2f2b3c652ada431ed +Subproject commit 3e716029ae61bf4c7bb33643ac331156e70e34f1 diff --git a/qtmultimedia b/qtmultimedia index 7a4478a4..2b34e335 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7a4478a4a411df9f21e1499d2301049f9045b7d6 +Subproject commit 2b34e3355c8943f41c84f39ad9a838f6edb80429 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4259e99c..e23d4b68 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4259e99c1990dc88632b85d945e9093cca47a831 +Subproject commit e23d4b68f3f3b1467f032e4ce3501dab0feb5fee diff --git a/qtwebengine b/qtwebengine index d9643a01..e02bcb08 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d9643a016abc743db1dd879e7622cd27f88ff392 +Subproject commit e02bcb0855ebee0612cab0f3cd3f9fd494497336 -- cgit v1.2.3 From 8d8b7d796fb43a7f6c1e2d10a5274c6a348d0e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 9 Jan 2019 12:25:31 +0200 Subject: Enable a no-gui build on Ubuntu 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2576 Change-Id: Iafdecb0571779077b722bde7521da681f00f6f60 Reviewed-by: Tony Sarajärvi Reviewed-by: Rolf Eike Beer Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index da452401..23b82ed4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,6 +10,7 @@ qtci-windows-10-x86_64-10 MSVC2017 qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation +qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild NoGui BuildExamples DisableTests qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests -- cgit v1.2.3 From 3cc1c40ff502ba5067fee21a9e3f7c7dc28f20a9 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 24 May 2019 16:26:50 +0300 Subject: Remove tests from Saferenderer static build Task-number: QSR-458 Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee Reviewed-by: Teemu Holappa --- coin/platform_configs/qtsaferenderer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 837b331c..86de1e45 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic Static -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static -- cgit v1.2.3 From c5e443374aaa7d7cdfe90a69bbe3dc33604b5d32 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 8 May 2019 12:52:12 +0300 Subject: Use link to qt5.txt instead of copy in qt3d-runtime.txt Change-Id: If61fe724af869fb35637321311bfb052d3009956 Reviewed-by: Antti Kokko --- coin/platform_configs/qt3d-runtime.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 3de18a74..cbc25d9b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,22 +1 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 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 +qt5.txt -- cgit v1.2.3 From da9aac698db1de7db329f8fd3225b037a53862ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 16 May 2019 10:11:47 +0300 Subject: Provisioning: Install virtualenv to Ubuntu 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The python3-virtualenv package is missing the actual virtualenv executable. python3-virtualenv will get installed as dependency. Change-Id: If474831e8f46ac5dcd7e1028c97c7322c5e41b9d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index dae1a58e..d6c04d5b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -108,7 +108,7 @@ installPackages+=(g++-multilib) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) -installPackages+=(python3-virtualenv) +installPackages+=(virtualenv) installPackages+=(python3-wheel) # python2 development package installPackages+=(python-dev) -- cgit v1.2.3 From 25349a29f7fc1d90fe0389e1ae90ee382d754d36 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 21 May 2019 09:59:12 +0300 Subject: Remove examples from Saferenderer static Windows build Task-number: QSR-458 Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9 Reviewed-by: Teemu Holappa --- coin/platform_configs/qtsaferenderer.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 5158b45a..837b331c 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples Static +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic Static qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static -- cgit v1.2.3 From 1e290229e43466dbe7bfcf3d3bd1b4de2ac92259 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 21 May 2019 19:42:01 +0200 Subject: Adjust submodule branches --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..1478d69c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.4 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.4 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.4 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.4 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.4 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.4 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.4 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.4 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.4 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.4 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.4 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.4 status = addon -- cgit v1.2.3 From 849df311b181f816f756c5c1fcf1841bdc13cf19 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 May 2019 16:39:39 +0200 Subject: Update submodules on '5.12.4' in qt5 Change-Id: I73e3a64a4f9b0255c6e82ba638bf1f783e9867db Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 6f80588b..c4b5dbe1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6f80588bb7be82117b0d2406a61bda9ca6dfbec3 +Subproject commit c4b5dbe1e015889b72defca4418717c5854a7acc diff --git a/qtactiveqt b/qtactiveqt index d3e71010..14e1cc30 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d3e7101032aa8c870fe4eda8ea5abe5bbfe4712e +Subproject commit 14e1cc30557d64e1c81066d8f7e9ffe67ef594b2 diff --git a/qtandroidextras b/qtandroidextras index c5e4882e..4a32bc04 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c5e4882e75c37f2c0462141793dffc4fa6710fc4 +Subproject commit 4a32bc040d79ff8df05f51b7e28e2b6f06a5d716 diff --git a/qtbase b/qtbase index 83347e2d..a275f1ec 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 83347e2d39dd967b6889977eddf77a18ff655ccc +Subproject commit a275f1eca3de6c497535e43d6452e89b5380fd8d diff --git a/qtcanvas3d b/qtcanvas3d index 9a7c0f06..ad446ce1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9a7c0f06fd375a1d7e07082338a4fa0cfc360751 +Subproject commit ad446ce15b43b5f9e2f6353cc64a52ac52ed98a2 diff --git a/qtcharts b/qtcharts index d7b03123..39ba71c1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d7b0312363a868d1d50ef4af032b57a36d50b24d +Subproject commit 39ba71c1ca03ac9b640d3af44ed8e08937b8ce45 diff --git a/qtconnectivity b/qtconnectivity index 3d0ac0c8..c6c3241a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3d0ac0c8e62e141f1e3300ac9b637d68bcc37ba7 +Subproject commit c6c3241a4713b3ea89837341214625514951f712 diff --git a/qtdatavis3d b/qtdatavis3d index 13c950f0..18c303dc 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 13c950f006160b8aa8aae559fcbd75d7d4f9be11 +Subproject commit 18c303dc1ed3e8cd8577e93c5223417e320e068d diff --git a/qtdeclarative b/qtdeclarative index 4a484211..bae6f43d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4a4842118d2303a8d851d1d8b85fe182d3fe492a +Subproject commit bae6f43d8e1fafec2771bdeddffa9edaf1bf6130 diff --git a/qtdoc b/qtdoc index 5c1d8140..2d9a9f5b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5c1d814079fbe77e4bd02c2a00385b891a371734 +Subproject commit 2d9a9f5b8f06de79b850f52eb9d1d92ed1dc35bd diff --git a/qtgamepad b/qtgamepad index 19ca9370..55bdecfd 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 19ca9370409d82a00841372df2e8bc0bf35148e7 +Subproject commit 55bdecfd14b643b222a9aae05ad1671e67be02ee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9490960f..9144bf66 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9490960f5fb4e56058f6b8c096617e94e9e5611d +Subproject commit 9144bf66a15520c30b3ecbb12c7482df40fc699a diff --git a/qtimageformats b/qtimageformats index 29300088..311a521d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 293000886199483ea63ccc5e71ac0bf1c3071a0e +Subproject commit 311a521df449554a24555d3603cef365550ea254 diff --git a/qtlocation b/qtlocation index 4d3183c6..1459f447 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4d3183c6ca22203a75e29af601b4c407231eaab4 +Subproject commit 1459f4474282c8804adf01f4faba70944771c5d7 diff --git a/qtmacextras b/qtmacextras index 576926d0..9e6f9ab8 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 576926d0608b1d37b88d56b8bf873aeb1c57d149 +Subproject commit 9e6f9ab815a554c74ac5beb58d949eef84b36e41 diff --git a/qtmultimedia b/qtmultimedia index 6e6871ad..9702acf1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e6871ad398318d61840705de9d057d8eb7726f5 +Subproject commit 9702acf13dde540b292693f330622561c46fc589 diff --git a/qtnetworkauth b/qtnetworkauth index effb9ec6..be407734 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit effb9ec6f5abfe50277de410769e7d8e01e6d97f +Subproject commit be4077347fa8d492553e7e08e4fffe0f439fbd4f diff --git a/qtpurchasing b/qtpurchasing index 9a451391..8eb2ead6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9a451391f077093307cc7f3ac8cee5a0f6a168fd +Subproject commit 8eb2ead663a55d6c0bfd83f8914bd2369846df55 diff --git a/qtqa b/qtqa index 604a768d..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtquickcontrols b/qtquickcontrols index 8c015b37..87f79ca0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8c015b374b66c952ff43150f0ffcee433a9eb412 +Subproject commit 87f79ca0cfe432b7758fa19472cc7133275818c5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9310d5fb..33e590ea 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9310d5fb5285ae5eb4b94c01606791319b775b85 +Subproject commit 33e590ea30931306e055fe4a6ae38da8b3fe3d0c diff --git a/qtremoteobjects b/qtremoteobjects index c96a4193..24468801 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c96a4193e5d4d46804e8a11fad3b0e95d02b037b +Subproject commit 244688018624f5f753efa16f7fe6c7b60a80fda2 diff --git a/qtscript b/qtscript index 484e9de6..d7c60f50 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 484e9de6d86d011bd349890cba87a25554b0f672 +Subproject commit d7c60f5072fddf7a46f614b12062cedfde26c997 diff --git a/qtscxml b/qtscxml index 80a9f4df..bcb916be 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 80a9f4dfd078c4df1bc2c7fa279d637debfd672a +Subproject commit bcb916bec1e0b5cbd169367819e825f04115751f diff --git a/qtsensors b/qtsensors index a4b7814e..d5888b17 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a4b7814ec945b979bafdc6de60800bbddd4d240e +Subproject commit d5888b178da6d34704ee074065f176000ffaab29 diff --git a/qtserialbus b/qtserialbus index 673495d2..14491611 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 673495d2eb1fe9cdf701351d75c2203c80ab6ba5 +Subproject commit 144916119e83e342d6b46127fb3ffabaa365b4fb diff --git a/qtserialport b/qtserialport index 574098ec..27da5ad5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 574098ec0d928d8eb02cf997318c0168952297e9 +Subproject commit 27da5ad525841f7b335318c620cc25410b2606e9 diff --git a/qtspeech b/qtspeech index 7529a900..f845e113 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7529a90059a72681ff106500ac64ce6c00e9b229 +Subproject commit f845e1133d69f2c8b0ac79b7b673978e2981b4f5 diff --git a/qtsvg b/qtsvg index 6292c75f..5db971a4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6292c75fb742f2877630ec22fb3a9b0d3afc9a96 +Subproject commit 5db971a48bb1a9ed5c4b51254e611d56680bd85a diff --git a/qttools b/qttools index 6c1ca200..fb9a1cdf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c1ca200d52d671b1f33125d99d6e0cd6d469634 +Subproject commit fb9a1cdf638145c5003ee18da71e28e424f91b77 diff --git a/qttranslations b/qttranslations index ebd5ad86..a975fdb5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ebd5ad86ac35fc27e58489d1389abb6cacfb2b13 +Subproject commit a975fdb586b87e9578f0c12afe195317dfd2cd5b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 717a56c5..56c783d8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 717a56c54382942425a66e012f41782593e0444e +Subproject commit 56c783d8fd93b8d3e13555da6fa398ddb09cce97 diff --git a/qtwayland b/qtwayland index c1b65146..07ec3a37 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c1b65146f6b9ad98edea424742f7594712758377 +Subproject commit 07ec3a37bd6bf28a96b8ff228eea86a09550db51 diff --git a/qtwebchannel b/qtwebchannel index fc891dad..7cb725d3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fc891dad209725113f49f42cfd59a5ced6ff89d2 +Subproject commit 7cb725d351d909675574a764fc19dd1f53d5c3e6 diff --git a/qtwebengine b/qtwebengine index efee223d..34c00625 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit efee223d7ff6e0e30fb9d9dff1536936922d4a03 +Subproject commit 34c00625d02db6167ae13f56e4b5bc0e94b602c9 diff --git a/qtwebglplugin b/qtwebglplugin index 10a64558..8fba2d11 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 10a64558ce927e2df0f2dfe7ff3d786d4737c06e +Subproject commit 8fba2d1110bed680941c6fef8ead9bfffeaf0003 diff --git a/qtwebsockets b/qtwebsockets index 30794c67..69f3b6ed 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 30794c6737a1105bdcd840e41ff374ece3bc60e1 +Subproject commit 69f3b6ed8b5036ff2dff9ea1ba232252c8f7d73a diff --git a/qtwebview b/qtwebview index d55be974..30b6f89e 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d55be9749b2dfc0e047da9e1d10a240923880a40 +Subproject commit 30b6f89e3694e667aae5700e17926c1761d16d12 diff --git a/qtwinextras b/qtwinextras index f68e9802..bc2ce0f3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f68e98026f6e37cf5db51e24bc90d3cf9be9d142 +Subproject commit bc2ce0f326658c561b6f6785ce566a194392a063 diff --git a/qtx11extras b/qtx11extras index 94162337..3b568d78 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 941623379f15db113551e7e887b0af58da17865a +Subproject commit 3b568d78454026b1d3abb46dd29d5eaca24aaf51 diff --git a/qtxmlpatterns b/qtxmlpatterns index 25a313cc..a8e46305 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 25a313cc7af41c2c63231499c49cc1f3e382e019 +Subproject commit a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c -- cgit v1.2.3 From f70bdd89b17cd58db8a49ee3c5968048d278b772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 16 May 2019 13:59:40 +0300 Subject: Update GCC version to 9.1.0 in Ubuntu 18.04 Task-number: QTQAINFRA-2958 Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/provisioning/common/linux/gcc.sh | 5 +++++ coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 44ff654b..44c63e2f 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -37,6 +37,8 @@ # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -ex @@ -97,6 +99,9 @@ function InstallGCC() { sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" fi + echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf + echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf + sudo ldconfig -v echo "GCC = $version" >> ~/versions.txt } diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 62940e21..947583da 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,5 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400 - +InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2 -- cgit v1.2.3 From d49c0cd0bbc535156007a9772e4561d6aaf6a105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Feb 2019 14:51:55 +0200 Subject: Split features list between Coin and qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi (cherry picked from commit 8cdf60fe6492490561cd6798901b201903ff6ab2) --- coin/platform_configs/default.txt | 56 ++++++++++++++++---------------- coin/platform_configs/qt5.txt | 42 ++++++++++++------------ coin/platform_configs/qtbase.txt | 9 +++-- coin/platform_configs/qtconnectivity.txt | 4 +-- coin/platform_configs/qtsaferenderer.txt | 8 ++--- coin/platform_configs/qtsdk.txt | 8 ++--- coin/platform_configs/qtwebkit.txt | 8 ++--- coin/platform_configs/tqtc-qt-rta.txt | 11 +++---- 8 files changed, 72 insertions(+), 74 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 23b82ed4..4190f9ee 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,29 +1,29 @@ -Template Target OS Target arch Compiler Target Compiler Features ------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild NoGui BuildExamples DisableTests -qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests -qtci-linux-RHEL-7.4-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-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -verbose -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl +qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang +qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang +qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib 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.4-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ce289290..a56a3287 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 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 +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host linux-x86_64 -android-arch x86 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r18b -android-arch armeabi-v7a +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r18b -android-arch arm64-v8a +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r18b -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host darwin-x86_64 -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r18b -android-ndk-host darwin-x86_64 -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 15eb3b59..58912679 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,5 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 4ac73c86..bc03efee 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +--------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 86de1e45..e27b1490 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +Template Target OS Target arch Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt index 3011926d..ad320b09 100644 --- a/coin/platform_configs/qtsdk.txt +++ b/coin/platform_configs/qtsdk.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index a357ad5b..3eb40a5b 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8fbb5a00..82b086f9 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,6 +1,5 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------- -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-8.1-x86_64 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -- cgit v1.2.3 From b825df16f22b9d48557d021bdeace74995cd9007 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 3 Jun 2019 08:38:33 +0200 Subject: Update submodules on '5.12' in qt5 Skip qtbase in this round. Change-Id: Ibe33457533596f164b2d6342329378604e845720 Reviewed-by: Liang Qi --- qt3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 08b40b9b..50d41e6f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 08b40b9be75242505a773dc5b2a96a5ef481d6e6 +Subproject commit 50d41e6f0e7dd97f3d4cbd68423d59cacd4b7700 diff --git a/qtcharts b/qtcharts index d7b03123..c42f3dfa 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d7b0312363a868d1d50ef4af032b57a36d50b24d +Subproject commit c42f3dfa70212a601ef476e8258cbfc1caaf5477 diff --git a/qtdeclarative b/qtdeclarative index 3e716029..aefbf418 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3e716029ae61bf4c7bb33643ac331156e70e34f1 +Subproject commit aefbf418b6d99f87f7bcc7df1eb530c278a17ab4 diff --git a/qtmultimedia b/qtmultimedia index 2b34e335..3bbeae53 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2b34e3355c8943f41c84f39ad9a838f6edb80429 +Subproject commit 3bbeae539854c1474844c65025d40b813cec286c diff --git a/qtqa b/qtqa index ececaf29..305f198c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa diff --git a/qtquickcontrols b/qtquickcontrols index 84fbb488..0f74e642 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 84fbb48832e984c7fce1c4091adb0d340974a75f +Subproject commit 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e23d4b68..33531414 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e23d4b68f3f3b1467f032e4ce3501dab0feb5fee +Subproject commit 335314146dece4fa86c661a4094a2f73e5e81a43 diff --git a/qtrepotools b/qtrepotools index 64abf60a..f6f2b04b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 diff --git a/qtscxml b/qtscxml index 80a9f4df..a368b5fd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 80a9f4dfd078c4df1bc2c7fa279d637debfd672a +Subproject commit a368b5fdf4d33361e03a2f05b6f159566dd06e9d diff --git a/qttools b/qttools index 1e267143..b22049ea 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1e2671435fb828f088e6ca034a8724991907389f +Subproject commit b22049ea14b62a2a743fd5fbd23563c566ef528a diff --git a/qtwayland b/qtwayland index c1b65146..e008c69e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c1b65146f6b9ad98edea424742f7594712758377 +Subproject commit e008c69e231169425e2ae602deabc0eb749376ab diff --git a/qtwebengine b/qtwebengine index e02bcb08..2c86c348 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e02bcb0855ebee0612cab0f3cd3f9fd494497336 +Subproject commit 2c86c348d7a94f27d1e9e7a71c2435565cbe6fb5 -- cgit v1.2.3 From d77fdecc11054c6fb0c34824935fcbfcdf644734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 4 Jun 2019 11:10:57 +0300 Subject: Fix platform configuration files Typos, duplicate entries and one missing rebase ended up in the initial cherry-pick from 5.13 Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 8 ++++---- coin/platform_configs/qtdeclarative.txt | 4 ++++ coin/platform_configs/qtsaferenderer.txt | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 coin/platform_configs/qtdeclarative.txt diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 4190f9ee..602e5916 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,19 +2,19 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -verbose -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt new file mode 100644 index 00000000..a36c94a5 --- /dev/null +++ b/coin/platform_configs/qtdeclarative.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index e27b1490..e05c4992 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ +qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -- cgit v1.2.3 From b611da5b35425f6edd17a1190f5002f8f69337ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Jun 2019 23:31:03 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ibd78f70d7795b3927093d1f7de3cb59db2693cac Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 48f7f65d..224a6098 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 48f7f65dc34a9ef97d6b4cbca5fc251a7127f1a9 +Subproject commit 224a60989ed95e8b91ac88a12666af6e5a66e619 diff --git a/qtdeclarative b/qtdeclarative index aefbf418..b1e9bc58 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aefbf418b6d99f87f7bcc7df1eb530c278a17ab4 +Subproject commit b1e9bc580adc1e7b3b1398f392016880dc5201ba diff --git a/qtdoc b/qtdoc index 31beb249..faf46dfb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 31beb2498da41b21b718cccc622b5cb8045e97bc +Subproject commit faf46dfbcbfc058b3bd891f0b3ae45401b58e7d7 diff --git a/qtmultimedia b/qtmultimedia index 3bbeae53..edbc8cb3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3bbeae539854c1474844c65025d40b813cec286c +Subproject commit edbc8cb39130410801bffefb59d5c3a3c383e84b diff --git a/qttools b/qttools index b22049ea..c7f96f53 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b22049ea14b62a2a743fd5fbd23563c566ef528a +Subproject commit c7f96f5301c2e60d1c5ef1e945e70e921afc71ce diff --git a/qtwayland b/qtwayland index e008c69e..af9ec8a7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e008c69e231169425e2ae602deabc0eb749376ab +Subproject commit af9ec8a76d7e62444fadb518256fc58723fe5186 -- cgit v1.2.3 From 608788de2d10c55b0b3d7c11776f368da015a89a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit c09135cb56e03dd6a09b79f2c6e15932e9433df2) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index c0d75ff6..d0acdd45 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version -- cgit v1.2.3 From a2b1dd2d0afe58f27b1585ecab5235ae32932ef8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Apr 2019 13:43:07 +0300 Subject: Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi (cherry picked from commit dbaa42baa77309a1aa407cd45078d885f7428aa2) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/android_linux.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a15bcf03..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index d0acdd45..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" -- cgit v1.2.3 From 1cf289d1827655da5a78c1fba1249546c149b499 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 24 May 2019 16:26:50 +0300 Subject: Remove tests from Saferenderer static build Task-number: QSR-458 Reviewed-by: Teemu Holappa (cherry picked from commit 3cc1c40ff502ba5067fee21a9e3f7c7dc28f20a9) Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee Reviewed-by: Jani Heikkinen --- coin/platform_configs/qtsaferenderer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 837b331c..86de1e45 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic Static -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static -- cgit v1.2.3 From 6c6c6ca1a5e1b2f79d3784d713aaa4d0adeaaeac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Feb 2019 14:51:55 +0200 Subject: Split features list between Coin and qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi (cherry picked from commit 8cdf60fe6492490561cd6798901b201903ff6ab2) (cherry picked from commit d49c0cd0bbc535156007a9772e4561d6aaf6a105) Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 54 ++++++++++++++++---------------- coin/platform_configs/qt5.txt | 42 ++++++++++++------------- coin/platform_configs/qtbase.txt | 9 +++--- coin/platform_configs/qtconnectivity.txt | 4 +-- coin/platform_configs/qtsaferenderer.txt | 8 ++--- coin/platform_configs/qtsdk.txt | 8 ++--- coin/platform_configs/qtwebkit.txt | 8 ++--- coin/platform_configs/tqtc-qt-rta.txt | 11 +++---- 8 files changed, 71 insertions(+), 73 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index da452401..92d33c3f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,28 @@ -Template Target OS Target arch Compiler Target Compiler Features ------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests -qtci-linux-RHEL-7.4-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-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -verbose -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace +qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang +qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang +qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib 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.4-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ce289290..0605cc7f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 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 +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 15eb3b59..58912679 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,5 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 4ac73c86..bc03efee 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +--------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 86de1e45..e27b1490 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +Template Target OS Target arch Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt index 3011926d..ad320b09 100644 --- a/coin/platform_configs/qtsdk.txt +++ b/coin/platform_configs/qtsdk.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index a357ad5b..3eb40a5b 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8fbb5a00..82b086f9 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,6 +1,5 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------- -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-8.1-x86_64 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -- cgit v1.2.3 From 5fd662b550d2fc8f32101ef3a4981e71c01b2f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 4 Jun 2019 11:10:57 +0300 Subject: Fix platform configuration files Typos, duplicate entries and one missing rebase ended up in the initial cherry-pick from 5.13 Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e Reviewed-by: Heikki Halmet (cherry picked from commit d77fdecc11054c6fb0c34824935fcbfcdf644734) Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 8 ++++---- coin/platform_configs/qtdeclarative.txt | 4 ++++ coin/platform_configs/qtsaferenderer.txt | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 coin/platform_configs/qtdeclarative.txt diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 92d33c3f..523fdeda 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,18 +2,18 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -verbose -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt new file mode 100644 index 00000000..a36c94a5 --- /dev/null +++ b/coin/platform_configs/qtdeclarative.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index e27b1490..e05c4992 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ +qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -- cgit v1.2.3 From 31f5c48a80e140562588bd673ef35fb4efe3d643 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38) --- coin/platform_configs/default.txt | 18 ++-- coin/platform_configs/qt5.txt | 2 +- .../common/linux/openssl_for_android_linux.sh | 38 +++++---- coin/provisioning/common/macos/install_openssl.sh | 81 ------------------ coin/provisioning/common/unix/install-openssl.sh | 91 +++++++++++++++++++++ .../common/windows/android-openssl.ps1 | 33 +++++--- coin/provisioning/common/windows/openssl.ps1 | 6 +- .../09-install-openssl.sh | 6 ++ .../09-install-openssl.sh | 6 ++ .../10-openssl_for_android_linux.sh | 43 ---------- .../50-openssl_for_android_linux.sh | 43 ++++++++++ .../09-install-openssl.sh | 6 ++ .../50-openssl_for_android_linux.sh | 39 +++++++++ .../09-install-openssl.sh | 6 ++ .../50-openssl_for_android_linux.sh | 39 +++++++++ .../09-install-openssl.sh | 6 ++ .../10-openssl_for_android_linux.sh | 39 --------- .../50-openssl_for_android_linux.sh | 39 +++++++++ .../09-install-openssl.sh | 6 ++ .../qtci-macos-10.12-x86_64/35-openssl.sh | 2 +- .../qtci-macos-10.13-x86_64/35-openssl.sh | 2 +- .../10-openssl_for_android.ps1 | 1 - .../50-openssl_for_android.ps1 | 1 + .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 95 +++++++++++++++++++++- 24 files changed, 439 insertions(+), 209 deletions(-) delete mode 100755 coin/provisioning/common/macos/install_openssl.sh create mode 100755 coin/provisioning/common/unix/install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-install-openssl.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 523fdeda..9d9c9625 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,20 +7,20 @@ qtci-windows-10-x86_64-10 MSVC2015 qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace -qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 -I {{.Env.OPENSSL_HOME}} +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -I {{.Env.OPENSSL_HOME}} +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -I {{.Env.OPENSSL_HOME}} qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I /home/qt/openssl-1.0.2/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0605cc7f..a2b374d0 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-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 09d0b6d5..d833975f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -35,32 +35,38 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. - +set -ex # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2p" +exports_file="/tmp/export.sh" +# source previously made environmental variables. +if uname -a |grep -q "Ubuntu"; then + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file + rm -rf "$exports_file" +else + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file + rm -rf "$exports_file" +fi + +version="1.1.1b" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -installFolder="/home/qt/" -sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" -# Until every VM doing Linux Android builds have provisioned the env variable -# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. -# QTQAINFRA-1436 -opensslHome="${installFolder}openssl-1.0.2" - +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +mkdir -p "${HOME}/openssl/android/" +tar -xzf "$targetFile" -C "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "$installFolder" -# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}p" "${opensslHome}" -pushd "$opensslHome" - -echo "Running configure" -perl Configure shared android +TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin +cd "$opensslHome" +PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm +PATH=$TOOLCHAIN:$PATH CC=clang make build_generated SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh deleted file mode 100755 index 3b1978e2..00000000 --- a/coin/provisioning/common/macos/install_openssl.sh +++ /dev/null @@ -1,81 +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 install OpenSSL - -set -ex - -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -openssl_install_dir=/usr/local/openssl-$opensslVersion -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=$openssl_install_dir -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s $openssl_install_dir $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" -SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" -SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh new file mode 100755 index 00000000..afc1509e --- /dev/null +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script install OpenSSL from sources. +# Requires GCC and Perl to be in PATH. +set -ex +os="$1" +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +version="1.1.1b" +officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" +targetFile="/tmp/openssl-$version.tar.gz" +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl-${version}" +opensslSource="${opensslHome}-src" +DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +tar -xzf "$targetFile" -C "$HOME" +mv "$opensslHome" "$opensslSource" +cd "$opensslSource" +pwd + +if [[ "$os" == "linux" ]]; then + ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" + make && make install_sw install_ssldirs + SetEnvVar "OPENSSL_HOME" "$opensslHome" +elif [ "$os" == "macos" ]; then + # Below target location has been hard coded into Coin. + # QTQAINFRA-1195 + openssl_install_dir=/usr/local/openssl-$version + opensslTargetLocation="/usr/local/opt/openssl" + sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack" + echo "Running 'make' for OpenSSL" + # shellcheck disable=SC2024 + sudo make --silent > /tmp/openssl_make.log 2>&1 + echo "Running 'make install' for OpenSSL" + # shellcheck disable=SC2024 + sudo make --silent install > /tmp/openssl_make_install.log 2>&1 + + path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') + sudo mkdir -p "$path" + sudo ln -s $openssl_install_dir $opensslTargetLocation + + SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" + SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" + + SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" + SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" + SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" + + security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null + security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +fi + + +echo "OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index cf144c90..981fa51d 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -35,33 +35,40 @@ . "$PSScriptRoot\helpers.ps1" +if (Is64BitWinHost) { + $msys_bash = "C:\Utils\msys64\usr\bin\bash" +} else { + $msys_bash = "C:\Utils\msys32\usr\bin\bash" +} + # OpenSSL need to be configured from sources for Android build in windows 7 # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.0.2p" +$version = "1.1.1b" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c" +$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" $destination = "C:\Utils\openssl-android-master" +# msys unix style paths +$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$openssl_path = "/c/Utils/openssl-android-master" +$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 -Extract-7Zip $zip C:\Utils -Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils -Rename-Item C:\Utils\openssl-$version $destination +Extract-7Zip $zip C:\Utils\tmp +Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp +Move-Item C:\Utils\tmp\openssl-${version} $destination Remove-Item -Path $zip -Remove-Item C:\Utils\openssl-$version.tar - -# Make sure configure for openssl has a "make" and "perl" available -$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" Write-Host "Configuring OpenSSL $version for Android..." Push-Location $destination -Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`"" +# $ must be escaped in powershell... +Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") +Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") Pop-Location -# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. -# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h - +Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" +Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 4cc6a3b3..2f21db37 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_0_2p" +$version = "1_1_1b" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" + $sha1 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" +$sha1 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" 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/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..ef2b3ba8 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-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-Ubuntu-16.04-x86/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -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-Ubuntu-16.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -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-Ubuntu-18.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -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-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -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-openSUSE-42.3-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 deleted file mode 100644 index 25c6f28a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 new file mode 100644 index 00000000..25c6f28a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index d57ad1cd..ae867cdc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -1 +1,94 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" +############################################################################# +## +## 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\..\common\windows\helpers.ps1" + +# This script installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2p" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +if (Is64BitWinHost) { + + # Install x64 bit version + $architecture = "x64" + $installFolder = "C:\openssl" + $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" + $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" + + Write-Host "Fetching from URL ..." + Download $externalUrl $internalUrl $packagex64 + Verify-Checksum $packagex64 $sha1 + Write-Host "Installing $packagex64 ..." + Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + + Write-Host "Remove downloaded $packagex64 ..." + Remove-Item -Path $packagex64 + + Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" + Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" + Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" +} + +# Install x86 bit version +$architecture = "x86" + +if (Is64BitWinHost) { + $installFolder = "C:\openssl$architecture" +} else { + $installFolder = "C:\openssl" +} + +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" + +Write-Host "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +Write-Host "Installing $packagex86 ..." +Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +Write-Host "Remove downloaded $packagex86 ..." +Remove-Item -Path $packagex86 + +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" +Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +Write-Output "OpenSSL = $version" >> ~/versions.txt + -- cgit v1.2.3 From b9e92adf5950d35ade47101641cf8f318bb77aef 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 (cherry picked from commit 6465c421225574dc1c5d9f23293c37e784fd1b02) Reviewed-by: Jani Heikkinen --- 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 c8deeb3d052bafd4ba50e44de56958b62b98fd82 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 11 Apr 2019 12:24:45 +0300 Subject: Provision sed for windows 10 Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet (cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/windows/helpers.ps1 | 12 +++++ coin/provisioning/common/windows/install-sed.ps1 | 60 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/09-install-sed.ps1 | 1 + 3 files changed, 73 insertions(+) create mode 100644 coin/provisioning/common/windows/install-sed.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f5318bcb..6e8e0365 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -136,6 +136,18 @@ function Add-Path $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } +function Prepend-Path +{ + Param ( + [string]$Path + ) + Write-Host "Adding $Path to Path" + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", "$Path;" + $oldPath, [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +} + function Set-EnvironmentVariable { Param ( diff --git a/coin/provisioning/common/windows/install-sed.ps1 b/coin/provisioning/common/windows/install-sed.ps1 new file mode 100644 index 00000000..2e1cbcd4 --- /dev/null +++ b/coin/provisioning/common/windows/install-sed.ps1 @@ -0,0 +1,60 @@ +############################################################################ +## +## 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 sed and it's dependencies + +$prog = "sed" +$version = "4.2.1" +$sha1 = "dfd3d1dae27a24784d7ab40eb074196509fa48fe" +$dep_sha1 = "f7edbd7152d8720c95d46dd128b87b8ba48a5d6f" +$pkg = "$prog-$version-bin.zip" +$dep_pkg = "$prog-$version-dep.zip" +$cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$pkg" +$dep_cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$dep_pkg" +$install_location = "c:\Utils\$prog" + +$tmp_location = "c:\users\qt\downloads" +Download $cached_url $cached_url "$tmp_location\$pkg" +Verify-Checksum "$tmp_location\$pkg" $sha1 sha1 +Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg" +Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1 + +Extract-7Zip "$tmp_location\$pkg" $install_location +Extract-7Zip "$tmp_location\$dep_pkg" $install_location +Remove "$tmp_location\$pkg" +Remove "$tmp_location\$dep_pkg" + +Prepend-Path "$install_location\bin" +Write-Output "sed = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" -- cgit v1.2.3 From acff1703e4ea565cc8b8f978338ebca751a709af Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 22 May 2019 13:13:16 +0300 Subject: Install prebuilded OpenSSL 1.1.1b for Windows 7 Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen (cherry picked from commit 247b429c3c435a62df3d6f94c96c7cd1b7c22299) --- .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 67 ++++++---------------- 1 file changed, 18 insertions(+), 49 deletions(-) diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index ae867cdc..f90938c4 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -33,62 +33,31 @@ . "$PSScriptRoot\..\common\windows\helpers.ps1" -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine +# This script will install OpenSSL prebuild version. Currently this pre-build version is only needed for Windows 7. +# Version was build using Windows 7 x86 and MSVC2010 -$version = "1_0_2p" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" +# Used build commands below: +# call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +# perl Configure no-asm VC-WIN32 --prefix=C:\openssl\ --openssldir=C:\openssl\ +# nmake +# nmake install -if (Is64BitWinHost) { - # Install x64 bit version - $architecture = "x64" - $installFolder = "C:\openssl" - $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" +$version = "1.1.1b" +$zip = Get-DownloadLocation ("openssl-$version.7z") +$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" - Write-Host "Fetching from URL ..." - Download $externalUrl $internalUrl $packagex64 - Verify-Checksum $packagex64 $sha1 - Write-Host "Installing $packagex64 ..." - Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" +Download $url $url $zip +Verify-Checksum $zip $sha1 +$installFolder = "C:\openssl" - Write-Host "Remove downloaded $packagex64 ..." - Remove-Item -Path $packagex64 +Extract-7Zip $zip "C:\" +Remove-Item -Path $zip - Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" - Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" - Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" -} - -# Install x86 bit version -$architecture = "x86" - -if (Is64BitWinHost) { - $installFolder = "C:\openssl$architecture" -} else { - $installFolder = "C:\openssl" -} - -$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" - -Write-Host "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -Write-Host "Installing $packagex86 ..." -Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -Write-Host "Remove downloaded $packagex86 ..." -Remove-Item -Path $packagex86 - -Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" +Prepend-Path "$installFolder\bin" -# Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "OpenSSL = $version" >> ~/versions.txt - -- cgit v1.2.3 From fb534d1b44d3e69418177ee8394527ee2bdb47f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Jun 2019 09:59:52 +0000 Subject: Update submodules on '5.12.4' in qt5 Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 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 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index c4b5dbe1..eab52395 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c4b5dbe1e015889b72defca4418717c5854a7acc +Subproject commit eab523957ac77542758f0172f0396c865933b200 diff --git a/qtactiveqt b/qtactiveqt index 14e1cc30..5bf0cff9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 14e1cc30557d64e1c81066d8f7e9ffe67ef594b2 +Subproject commit 5bf0cff9c707186379031782e909dd751bac61b6 diff --git a/qtandroidextras b/qtandroidextras index 4a32bc04..dcae0e10 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 4a32bc040d79ff8df05f51b7e28e2b6f06a5d716 +Subproject commit dcae0e1072ebc04af7578953c0ff70bbf535cf64 diff --git a/qtbase b/qtbase index a275f1ec..7932c99a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a275f1eca3de6c497535e43d6452e89b5380fd8d +Subproject commit 7932c99a31493add24f683a974042c8c80d74fc1 diff --git a/qtcanvas3d b/qtcanvas3d index ad446ce1..8ca2dfa6 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ad446ce15b43b5f9e2f6353cc64a52ac52ed98a2 +Subproject commit 8ca2dfa61c61280205af9ff9a6607a1794b5cd25 diff --git a/qtcharts b/qtcharts index 39ba71c1..e7051e75 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 39ba71c1ca03ac9b640d3af44ed8e08937b8ce45 +Subproject commit e7051e75c7004baf19a296cbb4f08a80f397b3f7 diff --git a/qtdatavis3d b/qtdatavis3d index 18c303dc..41d93443 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 18c303dc1ed3e8cd8577e93c5223417e320e068d +Subproject commit 41d93443ab264b4a0869290929e2de84b4a3c494 diff --git a/qtdeclarative b/qtdeclarative index bae6f43d..48b4df59 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bae6f43d8e1fafec2771bdeddffa9edaf1bf6130 +Subproject commit 48b4df598c88782f031f3df62964e159feeb20fb diff --git a/qtdoc b/qtdoc index 2d9a9f5b..e42afb29 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d9a9f5b8f06de79b850f52eb9d1d92ed1dc35bd +Subproject commit e42afb29c0e3b0c7e4263b68a1988ac415d8f52f diff --git a/qtgamepad b/qtgamepad index 55bdecfd..4ac7a6de 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 55bdecfd14b643b222a9aae05ad1671e67be02ee +Subproject commit 4ac7a6de3e5ed4e44ba8923852c71bcc8327d95b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9144bf66..7b92bc10 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9144bf66a15520c30b3ecbb12c7482df40fc699a +Subproject commit 7b92bc10c5bb7b5c87421198895eae632d10702b diff --git a/qtimageformats b/qtimageformats index 311a521d..43ca053b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 311a521df449554a24555d3603cef365550ea254 +Subproject commit 43ca053b50d7ed663c6734879070186bf28a0d29 diff --git a/qtlocation b/qtlocation index 1459f447..2e027974 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1459f4474282c8804adf01f4faba70944771c5d7 +Subproject commit 2e02797471e55684a71979f330a4f507e86e5bcc diff --git a/qtmacextras b/qtmacextras index 9e6f9ab8..98fd0eb0 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9e6f9ab815a554c74ac5beb58d949eef84b36e41 +Subproject commit 98fd0eb0f72f18fc4eca16137566ea6ca3479c71 diff --git a/qtmultimedia b/qtmultimedia index 9702acf1..d73b5909 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9702acf13dde540b292693f330622561c46fc589 +Subproject commit d73b59093ec6fed8138460adcdf3ea0a45519a3c diff --git a/qtnetworkauth b/qtnetworkauth index be407734..d0b28afe 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit be4077347fa8d492553e7e08e4fffe0f439fbd4f +Subproject commit d0b28afe0e57857152a61f4a1d2b0dfe7a4bb6bb diff --git a/qtpurchasing b/qtpurchasing index 8eb2ead6..780bf06b 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 8eb2ead663a55d6c0bfd83f8914bd2369846df55 +Subproject commit 780bf06b9a938380eb9221532465db0d3069f38a diff --git a/qtqa b/qtqa index ececaf29..305f198c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa diff --git a/qtquickcontrols b/qtquickcontrols index 87f79ca0..8105e3ed 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 87f79ca0cfe432b7758fa19472cc7133275818c5 +Subproject commit 8105e3ed0e77f363ccc6406edd38082ac5cef27d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 33e590ea..783bfd21 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 33e590ea30931306e055fe4a6ae38da8b3fe3d0c +Subproject commit 783bfd2182f667817213faf3f54a285057bd2456 diff --git a/qtremoteobjects b/qtremoteobjects index 24468801..0cdd47b8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 244688018624f5f753efa16f7fe6c7b60a80fda2 +Subproject commit 0cdd47b80f26f5e7bb86b34ce31f07bbe2f49640 diff --git a/qtrepotools b/qtrepotools index 64abf60a..53caba03 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 diff --git a/qtscript b/qtscript index d7c60f50..a3d8a431 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d7c60f5072fddf7a46f614b12062cedfde26c997 +Subproject commit a3d8a431aaed65ee49cc9405f4f1ebd9e268a008 diff --git a/qtscxml b/qtscxml index bcb916be..45626a32 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bcb916bec1e0b5cbd169367819e825f04115751f +Subproject commit 45626a32aff0ff2ce279a94e18d58aee5583b4f9 diff --git a/qtsensors b/qtsensors index d5888b17..6e30eaa1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d5888b178da6d34704ee074065f176000ffaab29 +Subproject commit 6e30eaa1bda78b16fe9f467ad328a085bb3def09 diff --git a/qtserialbus b/qtserialbus index 14491611..76a08e3d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 144916119e83e342d6b46127fb3ffabaa365b4fb +Subproject commit 76a08e3d59a0ef7020464d73df6dd5a01e58c230 diff --git a/qtserialport b/qtserialport index 27da5ad5..68327f97 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 27da5ad525841f7b335318c620cc25410b2606e9 +Subproject commit 68327f976994cc941b58c2b2e3eb7726809509fd diff --git a/qtspeech b/qtspeech index f845e113..8a3b1082 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f845e1133d69f2c8b0ac79b7b673978e2981b4f5 +Subproject commit 8a3b10828920bdf94fdd7b6a1f6b2024d829244d diff --git a/qtsvg b/qtsvg index 5db971a4..29249cf7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5db971a48bb1a9ed5c4b51254e611d56680bd85a +Subproject commit 29249cf721863cdebdce5d48ded59e295f58a710 diff --git a/qttools b/qttools index fb9a1cdf..af241efd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fb9a1cdf638145c5003ee18da71e28e424f91b77 +Subproject commit af241efd145cd6e9c8b8b4107fc0a7b78da16c4c diff --git a/qttranslations b/qttranslations index a975fdb5..41dc0e7c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a975fdb586b87e9578f0c12afe195317dfd2cd5b +Subproject commit 41dc0e7c0f3e1183b22d85114b013925a1d44319 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 56c783d8..9d6cdde0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 56c783d8fd93b8d3e13555da6fa398ddb09cce97 +Subproject commit 9d6cdde0ae4213eb7cc53baab22e183f3c93507d diff --git a/qtwayland b/qtwayland index 07ec3a37..2e4246ee 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 07ec3a37bd6bf28a96b8ff228eea86a09550db51 +Subproject commit 2e4246ee71dd6689d3731e380f393185a1e3bd8e diff --git a/qtwebchannel b/qtwebchannel index 7cb725d3..b7956224 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7cb725d351d909675574a764fc19dd1f53d5c3e6 +Subproject commit b79562247f6dfe2ad26804c0eca891a529179dd0 diff --git a/qtwebengine b/qtwebengine index 34c00625..597359a1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 34c00625d02db6167ae13f56e4b5bc0e94b602c9 +Subproject commit 597359a16a798df3955404200f1fc6833a7425ab diff --git a/qtwebglplugin b/qtwebglplugin index 8fba2d11..ccf8f2f2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8fba2d1110bed680941c6fef8ead9bfffeaf0003 +Subproject commit ccf8f2f2b1729149965921462d9c2d3e5dd8f57a diff --git a/qtwebsockets b/qtwebsockets index 69f3b6ed..9db762ad 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 69f3b6ed8b5036ff2dff9ea1ba232252c8f7d73a +Subproject commit 9db762ad97338567a614177564f68fee780fefce diff --git a/qtwebview b/qtwebview index 30b6f89e..9ca4eec0 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 30b6f89e3694e667aae5700e17926c1761d16d12 +Subproject commit 9ca4eec0bc5c0fa9d4ab76df5eb06129765bc09a diff --git a/qtwinextras b/qtwinextras index bc2ce0f3..ab937fb3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit bc2ce0f326658c561b6f6785ce566a194392a063 +Subproject commit ab937fb390696a1adf6a97d820c900a53d316a62 diff --git a/qtx11extras b/qtx11extras index 3b568d78..2fe9b682 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 3b568d78454026b1d3abb46dd29d5eaca24aaf51 +Subproject commit 2fe9b682bbba406356a38cc4661330259dd97b97 diff --git a/qtxmlpatterns b/qtxmlpatterns index a8e46305..4efc4b1d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c +Subproject commit 4efc4b1d0c11b68e1140734f659b22ce266d1bd6 -- cgit v1.2.3 From 1db94fc9ef1f6b61bca081ce9ffb8216e8232c32 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 6 Jun 2019 11:28:12 +0300 Subject: Add platform configuration file for ogl-runtime repository Use configuration from qt5.txt. Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908 Reviewed-by: Jukka Jokiniva Reviewed-by: Iikka Eklund Reviewed-by: Jani Heikkinen --- coin/platform_configs/ogl-runtime.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/platform_configs/ogl-runtime.txt diff --git a/coin/platform_configs/ogl-runtime.txt b/coin/platform_configs/ogl-runtime.txt new file mode 100644 index 00000000..cbc25d9b --- /dev/null +++ b/coin/platform_configs/ogl-runtime.txt @@ -0,0 +1 @@ +qt5.txt -- cgit v1.2.3 From 01c38dfad8ebf91397328f773cc37d21ff5606e6 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 8 May 2019 12:52:12 +0300 Subject: Use link to qt5.txt instead of copy in qt3d-runtime.txt Change-Id: If61fe724af869fb35637321311bfb052d3009956 Reviewed-by: Antti Kokko (cherry picked from commit c5e443374aaa7d7cdfe90a69bbe3dc33604b5d32) Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 3de18a74..cbc25d9b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,22 +1 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 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 +qt5.txt -- cgit v1.2.3 From 0e454d2a148c4db9dad947e84d9a612549bba47e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Jun 2019 04:05:34 +0000 Subject: Update submodules on '5.12.4' in qt5 Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549 Reviewed-by: Jani Heikkinen --- qtconnectivity | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index c6c3241a..f6be1f73 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c6c3241a4713b3ea89837341214625514951f712 +Subproject commit f6be1f73a810514335ab3d27e1d05825a36b06af diff --git a/qtwebengine b/qtwebengine index 597359a1..80674ddb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 597359a16a798df3955404200f1fc6833a7425ab +Subproject commit 80674ddb452c6926a01fcb0f35699252cf452043 -- cgit v1.2.3 From de415914772b5ced911ec9f04738dab2ec355fc9 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 11 Jun 2019 15:40:29 +0300 Subject: Fix openssl 1.1 library configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen Reviewed-by: Simo Fält --- coin/platform_configs/default.txt | 14 +++++++------- coin/provisioning/common/unix/install-openssl.sh | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 9d9c9625..79ba11d1 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,13 +7,13 @@ qtci-windows-10-x86_64-10 MSVC2015 qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -I {{.Env.OPENSSL_HOME}} -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -I {{.Env.OPENSSL_HOME}} +qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index afc1509e..01a20935 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -59,6 +59,12 @@ if [[ "$os" == "linux" ]]; then ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" + if uname -a |grep -q "Ubuntu"; then + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile + else + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc + fi + elif [ "$os" == "macos" ]; then # Below target location has been hard coded into Coin. # QTQAINFRA-1195 -- cgit v1.2.3 From d87d4e0219653d2af40b184c8bbe3079f8c21384 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 5 Jun 2019 13:19:46 +0300 Subject: Disable MySQL from packaging builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't link against 3rd party GPL libraries Task-number: QTBUG-76081 Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241 Reviewed-by: Tony Sarajärvi (cherry picked from commit a05bd71ede9e2c67a66fd2d28fab8e9e9386e51c) Change-Id: I97d1d06b266490080325126e2dd715436a91b01a Reviewed-by: Simo Fält --- coin/platform_configs/default.txt | 22 +++++++++++----------- coin/platform_configs/qt5.txt | 38 +++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 79ba11d1..5417e7ee 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,27 +2,27 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-armle-v7-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index a2b374d0..09402127 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -- cgit v1.2.3 From e926f950490d924242f379be60dc62bfca2a51c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 13 Jun 2019 03:10:05 +0000 Subject: Update submodules on '5.12.4' in qt5 Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- qtrepotools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 7932c99a..d8efc8d7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7932c99a31493add24f683a974042c8c80d74fc1 +Subproject commit d8efc8d718e3b3a0464f321e740541f5b221a5d6 diff --git a/qtqa b/qtqa index 305f198c..9ebbac76 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa +Subproject commit 9ebbac76e9e3141df8acee48f4a60cdceb614244 diff --git a/qtrepotools b/qtrepotools index 53caba03..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf -- cgit v1.2.3 From 6e350aff34545e7b41b07617c9152f81db735702 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Wed, 12 Jun 2019 15:15:32 +0300 Subject: ogl-runtime: instead of linking to qt5.txt use the actual configuration Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c Reviewed-by: Jani Heikkinen --- coin/platform_configs/ogl-runtime.txt | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/ogl-runtime.txt b/coin/platform_configs/ogl-runtime.txt index cbc25d9b..a2b374d0 100644 --- a/coin/platform_configs/ogl-runtime.txt +++ b/coin/platform_configs/ogl-runtime.txt @@ -1 +1,21 @@ -qt5.txt +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -- cgit v1.2.3 From 452e0d94d40bba15a56293a0a0f7d093dececda9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 18 Jun 2019 10:36:01 +0200 Subject: Update submodules on '5.12' in qt5 Ignore qtvirtualkeyboard temporarily. Task-number: QTBUG-76371 Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7 Reviewed-by: Liang Qi --- .gitmodules | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..9884474c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -264,7 +264,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.12 - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative diff --git a/qtbase b/qtbase index 224a6098..06766453 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 224a60989ed95e8b91ac88a12666af6e5a66e619 +Subproject commit 067664531853a1e857c777c1cc56fc64b272e021 diff --git a/qtdeclarative b/qtdeclarative index b1e9bc58..1eb3a6fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b1e9bc580adc1e7b3b1398f392016880dc5201ba +Subproject commit 1eb3a6febec8fa8bb616a3765c1a899210135f31 diff --git a/qtdoc b/qtdoc index faf46dfb..9dc3bd8f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit faf46dfbcbfc058b3bd891f0b3ae45401b58e7d7 +Subproject commit 9dc3bd8fea81a8e1bba751215c7ff0ebacdd1b92 diff --git a/qtmultimedia b/qtmultimedia index edbc8cb3..8933a597 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit edbc8cb39130410801bffefb59d5c3a3c383e84b +Subproject commit 8933a59719a5f0c33d47f202d220a566765ec6d4 diff --git a/qtqa b/qtqa index 305f198c..76b891a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa +Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 diff --git a/qtrepotools b/qtrepotools index f6f2b04b..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf diff --git a/qtserialbus b/qtserialbus index 673495d2..a49336c7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 673495d2eb1fe9cdf701351d75c2203c80ab6ba5 +Subproject commit a49336c78a0b610b2dff25ecc1f292bdeefbfda7 diff --git a/qttools b/qttools index c7f96f53..0d2a9408 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c7f96f5301c2e60d1c5ef1e945e70e921afc71ce +Subproject commit 0d2a9408ed2a5c664330c5742c9afb610a6c7348 diff --git a/qttranslations b/qttranslations index ebd5ad86..6a580f7b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ebd5ad86ac35fc27e58489d1389abb6cacfb2b13 +Subproject commit 6a580f7b92cca74c824fca66c136df84725ecc62 diff --git a/qtwebengine b/qtwebengine index 2c86c348..af1c0087 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2c86c348d7a94f27d1e9e7a71c2435565cbe6fb5 +Subproject commit af1c0087e51b6e2ad905259bb7a1d50101735d2d -- cgit v1.2.3 From bb8b7c5140b94d6a3666ed0d4eefa42662edef20 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 18 Jun 2019 13:23:09 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I673d342cd906782d8444eebcb8e16ad6cec827f0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 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 50d41e6f..614eddc3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 50d41e6f0e7dd97f3d4cbd68423d59cacd4b7700 +Subproject commit 614eddc31186a05bc37cfcb071caf9851ac1d010 diff --git a/qtactiveqt b/qtactiveqt index d3e71010..d9aa0a60 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d3e7101032aa8c870fe4eda8ea5abe5bbfe4712e +Subproject commit d9aa0a60c1c627f141fad2eeba3c38480a1b61d3 diff --git a/qtandroidextras b/qtandroidextras index c5e4882e..77485c52 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c5e4882e75c37f2c0462141793dffc4fa6710fc4 +Subproject commit 77485c52210cb3d6a2899498331986ab64756811 diff --git a/qtbase b/qtbase index 06766453..8e528d8b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 067664531853a1e857c777c1cc56fc64b272e021 +Subproject commit 8e528d8bd08406e9cc86abcfe153f02d585d3654 diff --git a/qtcanvas3d b/qtcanvas3d index 9a7c0f06..9fe40cb1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9a7c0f06fd375a1d7e07082338a4fa0cfc360751 +Subproject commit 9fe40cb19ef5196cd84d58faea82e023d6c32d38 diff --git a/qtcharts b/qtcharts index c42f3dfa..1e7a6c8f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c42f3dfa70212a601ef476e8258cbfc1caaf5477 +Subproject commit 1e7a6c8f7818c39338f5addb8bd7b5f4b8de7322 diff --git a/qtdatavis3d b/qtdatavis3d index 13c950f0..eef5e526 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 13c950f006160b8aa8aae559fcbd75d7d4f9be11 +Subproject commit eef5e52668df079d1c401814d11dad22ec94e166 diff --git a/qtdeclarative b/qtdeclarative index 1eb3a6fe..850d037b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1eb3a6febec8fa8bb616a3765c1a899210135f31 +Subproject commit 850d037bd455f2d96b22825756ce136bbd681a6c diff --git a/qtdoc b/qtdoc index 9dc3bd8f..2fa86c42 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9dc3bd8fea81a8e1bba751215c7ff0ebacdd1b92 +Subproject commit 2fa86c42799b05f73797073061de1b1cbc7caefc diff --git a/qtgamepad b/qtgamepad index 19ca9370..a266d285 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 19ca9370409d82a00841372df2e8bc0bf35148e7 +Subproject commit a266d285e26a87ef0010dc05f5341e68a33fcb90 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9490960f..8f6ebb39 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9490960f5fb4e56058f6b8c096617e94e9e5611d +Subproject commit 8f6ebb395b3f9d6056b5d6bf76f6af6f43cab88d diff --git a/qtimageformats b/qtimageformats index 626c3053..79bf227d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 626c3053efd7905080ac4a65fca55551391a36e3 +Subproject commit 79bf227d7eba5eeb201ccdfee9b151ccb766df2a diff --git a/qtlocation b/qtlocation index 0e64148b..2b2a5ba9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0e64148b39ab7e7417d9d115ddc53631167989b1 +Subproject commit 2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452 diff --git a/qtmacextras b/qtmacextras index 576926d0..39f9523d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 576926d0608b1d37b88d56b8bf873aeb1c57d149 +Subproject commit 39f9523df09f5333f277ad2b7bfb625df72c2ae9 diff --git a/qtmultimedia b/qtmultimedia index 8933a597..9bbf9f0d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8933a59719a5f0c33d47f202d220a566765ec6d4 +Subproject commit 9bbf9f0d862b8d458e59690d36641618fb101b4e diff --git a/qtnetworkauth b/qtnetworkauth index effb9ec6..eccfd1e0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit effb9ec6f5abfe50277de410769e7d8e01e6d97f +Subproject commit eccfd1e04fde60022afdc80678316ecbd06031de diff --git a/qtpurchasing b/qtpurchasing index 9a451391..710a399d 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9a451391f077093307cc7f3ac8cee5a0f6a168fd +Subproject commit 710a399d4e8a9132172d45971152d18e1e16b3aa diff --git a/qtquickcontrols b/qtquickcontrols index 0f74e642..bc38b533 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 +Subproject commit bc38b5338000ab85564272077b27c88bd472aa0c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 33531414..698b8cf3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 335314146dece4fa86c661a4094a2f73e5e81a43 +Subproject commit 698b8cf356b97254eb2df0e903636b282a54a37d diff --git a/qtremoteobjects b/qtremoteobjects index ff04810b..c79feacd 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ff04810bd09d3897ccede880680dd94fcf585171 +Subproject commit c79feacd40f57d4a38500bd94fa1f549c1ac47e7 diff --git a/qtscript b/qtscript index 484e9de6..47ac322e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 484e9de6d86d011bd349890cba87a25554b0f672 +Subproject commit 47ac322e3e9a6f6350146d65bc87b981bba45b0f diff --git a/qtscxml b/qtscxml index a368b5fd..54c2106a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a368b5fdf4d33361e03a2f05b6f159566dd06e9d +Subproject commit 54c2106a5fcc49eecd1b85ec93bf2f44c69a0d3f diff --git a/qtsensors b/qtsensors index 14b5821f..ed0b4ed7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 14b5821f7b9998c1263c592d2cc70f21f1e72981 +Subproject commit ed0b4ed792504dc68d2f009ca19d69ef856002ba diff --git a/qtserialbus b/qtserialbus index a49336c7..9e51a7f4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a49336c78a0b610b2dff25ecc1f292bdeefbfda7 +Subproject commit 9e51a7f46eb74b4fe5c18160845f51d522f8bddb diff --git a/qtserialport b/qtserialport index 574098ec..029d3991 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 574098ec0d928d8eb02cf997318c0168952297e9 +Subproject commit 029d399148c1a0b6d7c4e9a36a5be348558ceee9 diff --git a/qtspeech b/qtspeech index 7529a900..4d83c0e3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7529a90059a72681ff106500ac64ce6c00e9b229 +Subproject commit 4d83c0e3d3e231778ed805e36f546926191bfe26 diff --git a/qtsvg b/qtsvg index 6292c75f..21f98a15 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6292c75fb742f2877630ec22fb3a9b0d3afc9a96 +Subproject commit 21f98a15c47c3d8d19f9e6b38f98f6324abe6b55 diff --git a/qttools b/qttools index 0d2a9408..8e3e12fa 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0d2a9408ed2a5c664330c5742c9afb610a6c7348 +Subproject commit 8e3e12faadd629fb8ae2bd1bd46f3c05e292a10e diff --git a/qtwayland b/qtwayland index af9ec8a7..7fe99c1d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit af9ec8a76d7e62444fadb518256fc58723fe5186 +Subproject commit 7fe99c1d78125b4b2b3ae7c2317b73acebb21425 diff --git a/qtwebchannel b/qtwebchannel index 14661300..ee896f24 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1466130070922a6cc55c2a5b724311780a394a13 +Subproject commit ee896f24693e8ac71102836cfa7550ab337f8edd diff --git a/qtwebengine b/qtwebengine index af1c0087..b78d307f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit af1c0087e51b6e2ad905259bb7a1d50101735d2d +Subproject commit b78d307f741e6fed23ee4b3326927b6f49d5f172 diff --git a/qtwebglplugin b/qtwebglplugin index 10a64558..23c1d55b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 10a64558ce927e2df0f2dfe7ff3d786d4737c06e +Subproject commit 23c1d55be7ee46c8950fe76c9740dc0462f1b462 diff --git a/qtwebsockets b/qtwebsockets index 30794c67..f582f7ec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 30794c6737a1105bdcd840e41ff374ece3bc60e1 +Subproject commit f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac diff --git a/qtwebview b/qtwebview index 460ba5ff..22247ff9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 460ba5ff499b59904139bd6fd6ecf24d04e403f0 +Subproject commit 22247ff992fe5050d2438a064b572059aca7e39b diff --git a/qtwinextras b/qtwinextras index f68e9802..f2196b17 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f68e98026f6e37cf5db51e24bc90d3cf9be9d142 +Subproject commit f2196b174bb0565055c8bc935b50ca90da5e6ffb diff --git a/qtx11extras b/qtx11extras index 94162337..bb5b7fd2 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 941623379f15db113551e7e887b0af58da17865a +Subproject commit bb5b7fd2e3fc365ec746d7e756556d410c5841d8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 25a313cc..ce43c8f6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 25a313cc7af41c2c63231499c49cc1f3e382e019 +Subproject commit ce43c8f6270518d801d91124ea1f32309c8e119d -- cgit v1.2.3 From 636194651887f585062ca0f437a3a2c65e3fa291 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Jun 2019 10:31:09 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I3b189f1cfbf6898e35b91eb821485f3b9eeb678b Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 8e528d8b..f344b635 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e528d8bd08406e9cc86abcfe153f02d585d3654 +Subproject commit f344b6357e751f54bcb003bc88c7fe15d616be7c diff --git a/qtcharts b/qtcharts index 1e7a6c8f..75f76f71 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1e7a6c8f7818c39338f5addb8bd7b5f4b8de7322 +Subproject commit 75f76f7157af7c9785fdca0825375abc4169300e diff --git a/qtdeclarative b/qtdeclarative index 850d037b..e9520ec8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 850d037bd455f2d96b22825756ce136bbd681a6c +Subproject commit e9520ec84c95e10a6826b2289e46552a2d446895 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 698b8cf3..188773bd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 698b8cf356b97254eb2df0e903636b282a54a37d +Subproject commit 188773bd1383883cd7247b6ded0d0b1a41689155 diff --git a/qtwebengine b/qtwebengine index b78d307f..3b04c836 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b78d307f741e6fed23ee4b3326927b6f49d5f172 +Subproject commit 3b04c83620a465a4f8876413c37696fbbc3a23d6 -- cgit v1.2.3 From 4048c76e6564bb14c9cb84a1751cb94eb451ae45 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Jun 2019 10:16:38 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Idb8c2824d7d6d7359b0845fcb200d1331029cec9 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtqa | 2 +- qttools | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 614eddc3..d48e15d2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 614eddc31186a05bc37cfcb071caf9851ac1d010 +Subproject commit d48e15d235645cbd6b08cd5fc5eb7ae84678c1fe diff --git a/qtbase b/qtbase index f344b635..0ef61500 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f344b6357e751f54bcb003bc88c7fe15d616be7c +Subproject commit 0ef61500059e6ebed30b76140a78e6e9149b318e diff --git a/qtcharts b/qtcharts index 75f76f71..166eae80 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 75f76f7157af7c9785fdca0825375abc4169300e +Subproject commit 166eae80efe685ffbc7097ebdbe3e68d12e7d2e0 diff --git a/qtqa b/qtqa index 76b891a5..3908dc23 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 +Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 diff --git a/qttools b/qttools index 8e3e12fa..e42dd0a1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8e3e12faadd629fb8ae2bd1bd46f3c05e292a10e +Subproject commit e42dd0a13ebf37f7402a4cf09a6fb62b8c740c76 diff --git a/qtwayland b/qtwayland index 7fe99c1d..ec905708 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7fe99c1d78125b4b2b3ae7c2317b73acebb21425 +Subproject commit ec9057081f1094fbfeb11449bc533997731e4079 -- cgit v1.2.3 From 0c339c29d6f2c1df4cd1178acf3acde598ebcc97 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 18 Jun 2019 09:41:55 +0200 Subject: platform_configs: Add missing "Configure arguments" to qtconnectivity.txt Without the tag configure arguments will not be parsed by Coin so that wrong configurations will be used. Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567 Reviewed-by: Liang Qi --- coin/platform_configs/qtconnectivity.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index bc03efee..2d378f84 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features +Template Target OS Target arch Compiler Features Configure arguments --------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -- cgit v1.2.3 From c06ab02f33084b425a04f5668a2e4284c4d569d9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 25 Jun 2019 10:30:36 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I961e20f994ffcbc97b822f53069cc3bd5a399345 Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtsvg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 0ef61500..5b5e8f78 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0ef61500059e6ebed30b76140a78e6e9149b318e +Subproject commit 5b5e8f78fecbe2bd9279bfa9ef10015cef8b1bc7 diff --git a/qtlocation b/qtlocation index 2b2a5ba9..7df7bc13 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452 +Subproject commit 7df7bc13f1b483504b01685888d3e3b6b6224a87 diff --git a/qtsvg b/qtsvg index 21f98a15..1cb4cd6e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 21f98a15c47c3d8d19f9e6b38f98f6324abe6b55 +Subproject commit 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 -- cgit v1.2.3 From 2fd2a20f18e3ca471294adc45671296865f22c8e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Jun 2019 09:24:40 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I5476ca1d214e18ba91b313f9a742d31fc9e04fe7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 5b5e8f78..530c6903 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5b5e8f78fecbe2bd9279bfa9ef10015cef8b1bc7 +Subproject commit 530c6903a449f44cc9c3fc578d5394c0eed8ddec diff --git a/qtdeclarative b/qtdeclarative index e9520ec8..abfa03d7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e9520ec84c95e10a6826b2289e46552a2d446895 +Subproject commit abfa03d7021aabe22f46a04d2b9d9f6adff2478a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 188773bd..bb88d844 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 188773bd1383883cd7247b6ded0d0b1a41689155 +Subproject commit bb88d84475f7c4bb69528da5096f4d2c91667a3c -- cgit v1.2.3 From 670aa09abaa781f41d8991f74cba8016ecbe47cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 16 May 2019 13:45:06 +0300 Subject: Provisioning: Fix cleanup when building GCC from sources We need sudo rights to delete the temporary folder where sources for GCC are extracted. Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/gcc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 44c63e2f..c26c9bf1 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -83,7 +83,7 @@ function InstallGCC() { sudo make install rm -rf "$targetFile" - rm -rf "$tmpFolder/gcc-$version" + sudo rm -rf "$tmpFolder/gcc-$version" fi # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links -- cgit v1.2.3 From d494d76c26df48c9cf3b45fc15ebad963fe34c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 9 Jan 2019 13:15:10 +0200 Subject: Add a no-opengl build on Ubuntu 18.04 Task-number: QTQAINFRA-2577 Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 2032cf9a..e9b5a561 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,6 +11,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -- cgit v1.2.3 From 91ab567a64d56ac38ee3cbd88eeecd991cf8f340 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 1 Apr 2019 12:34:43 +0300 Subject: Provisioning: Upgrade PyYAML because of possible security vulnerability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Known high severity security vulnerability in pyyaml v< 4.2b1 Task-number: QTQAINFRA-2888 Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84 Reviewed-by: Dominik Holland Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/shared/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/shared/requirements.txt b/coin/provisioning/common/shared/requirements.txt index 12380d85..60239142 100644 --- a/coin/provisioning/common/shared/requirements.txt +++ b/coin/provisioning/common/shared/requirements.txt @@ -13,7 +13,7 @@ Jinja2==2.10 MarkupSafe==1.0 path.py==11.0.1 pathtools==0.1.2 -PyYAML==3.13 +PyYAML==5.1 six==1.11.0 typing==3.6.4 watchdog==0.8.3 -- 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 dbaa42baa77309a1aa407cd45078d885f7428aa2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Apr 2019 13:43:07 +0300 Subject: Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/android_linux.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a15bcf03..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index d0acdd45..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" -- cgit v1.2.3 From 04fa1bf4ef48599973eceef5c3008ce7ca72a25b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 13 May 2019 17:11:00 +0200 Subject: Fix qtdeclarative boot2qt CI config DISTRO_OPTS was missing quotes. Change-Id: Iffcfce8e34f95b5a0c0f0309b26291b31b12a7dc Reviewed-by: Aapo Keskimolo --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 8e9e48fb..a36c94a5 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb -- cgit v1.2.3 From 3e6f5b1486a31e2396d70e97ee6803504725a597 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 May 2019 13:48:00 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Icc5ec39c45931aec77ca5287c14d08902ec6c551 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index e9642824..829675b6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e9642824244fa9fe55dca2cef8e002192a4f1b17 +Subproject commit 829675b65b8a9d661828b18bbd2703744d4c3db7 diff --git a/qtbase b/qtbase index 59111649..e6036cfc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 591116490cf313808e8ba05ddd066656a1d1a566 +Subproject commit e6036cfc5ae1b0ab30ef3e23f0bb3362db32f1a1 diff --git a/qtconnectivity b/qtconnectivity index b4c225c7..35a5cf01 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b4c225c747d91122f7c145b337ad611c025c1ab6 +Subproject commit 35a5cf01fb6ad16c039867d4f8ad3a3171fcc3a2 diff --git a/qtdeclarative b/qtdeclarative index 0a775ded..039071ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0a775ded35acf7172e3f852d55de7e28a5370653 +Subproject commit 039071ea5e93d93deb0103e7c9488198dcce55d6 diff --git a/qtdoc b/qtdoc index c1c45f8d..786e974f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c1c45f8d8cfe67b2605baad2ab72a4ec43aef3ec +Subproject commit 786e974f338df0d4e98130c1b9d68f1e30c85eae diff --git a/qtimageformats b/qtimageformats index dabcde31..f396928f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit dabcde3195e47683b31f0050c5de067863eb64e5 +Subproject commit f396928fb5af3e9df251afed7a15175f26ece8fb diff --git a/qtlocation b/qtlocation index ca339bc5..90defc33 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ca339bc55d6fc617c63e723c43150445fc8ac050 +Subproject commit 90defc33dceb341aa8dac03c0511b1ef2a20c6c2 diff --git a/qtmultimedia b/qtmultimedia index 268d78ca..7ef21f7e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 268d78ca745bf7d54545e51a4f22e2fa24a8675c +Subproject commit 7ef21f7ed206749252fbd03f673a8588890828b1 diff --git a/qtqa b/qtqa index 5f9ea5ce..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd2 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtremoteobjects b/qtremoteobjects index a8a3088f..ba171e01 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a8a3088f1fcd7ff00e7748040473c27c4bea8dad +Subproject commit ba171e01f90e9399ca4bfab0204b2932380ad64f diff --git a/qtsensors b/qtsensors index 299bbcdb..a6c957fa 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 299bbcdb59198910188ebe1abbae1d9868d8ae6d +Subproject commit a6c957faef10efce3056791a4bd3be900b423411 diff --git a/qtserialbus b/qtserialbus index 56211334..e163199a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 562113342f2b232d38a3ea05e84b8d2584799218 +Subproject commit e163199a2ff396de0a2395a8d4be7bdf443e682c diff --git a/qtserialport b/qtserialport index c1766c64..bab8ca79 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 +Subproject commit bab8ca799f3a54c10f92958f2db1ce482adfc08c diff --git a/qttools b/qttools index 24218dfb..17827131 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 24218dfbad58d5f5a50f7f274f315e852fca6b50 +Subproject commit 17827131e9dc7451e77b8a48a2ec879bc64cee38 diff --git a/qtwebchannel b/qtwebchannel index 11c8706b..cbb8fc1a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 11c8706b6c0ca3f9c0d195641fd0eea816899acd +Subproject commit cbb8fc1ae374e2b25c733e3f15109fb407e0cf95 diff --git a/qtwebengine b/qtwebengine index 99d46a8a..1d7aea38 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 99d46a8a918dee7323bc3d4f1624c47c097f9a3a +Subproject commit 1d7aea38167805d1c6abd00ba2d84981af720c66 diff --git a/qtwebview b/qtwebview index 159945f8..e06350f7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 159945f822e098d8d169ec1379675d8a664cea9e +Subproject commit e06350f7c414e8e4050abe2bb402b9b8ec0e5db7 diff --git a/qtxmlpatterns b/qtxmlpatterns index 9cfa05ed..0cad1b40 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9cfa05ed8beb0a9f323070060115e56064be9f3a +Subproject commit 0cad1b4051a69c5a96be41e7aaa8da97302785f5 -- cgit v1.2.3 From a0291fde84cd44e7d05a7f7a1946b64e537fd796 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 May 2019 16:22:05 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I5b52a5c17a612ba62948c01696e71c88bd84e85c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e6036cfc..aa8d3f90 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e6036cfc5ae1b0ab30ef3e23f0bb3362db32f1a1 +Subproject commit aa8d3f90a440575deef914916299b792105d7209 diff --git a/qtdeclarative b/qtdeclarative index 039071ea..fb4c12a9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 039071ea5e93d93deb0103e7c9488198dcce55d6 +Subproject commit fb4c12a9db86a4b886058cc937c3c20b798bd2e2 diff --git a/qtwayland b/qtwayland index a658a10f..21a5038f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a658a10f6a42e67bd762f87851c23cc1c1e3b141 +Subproject commit 21a5038f8a2a6acc6dd1cc2f6bb0318d2c17f741 diff --git a/qtwebengine b/qtwebengine index 1d7aea38..e710d15b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1d7aea38167805d1c6abd00ba2d84981af720c66 +Subproject commit e710d15b7243f2fbc99f98c3ca79d325eb459ac7 -- cgit v1.2.3 From a4e4c13f01157f2a51d48ef8d6dc6306b3ab9dd8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 May 2019 21:59:04 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I43c1b4dac692f6c93702d05d3ee2a2ec224b2736 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 829675b6..d72fba3c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 829675b65b8a9d661828b18bbd2703744d4c3db7 +Subproject commit d72fba3c60af5fd3aba43fd33630f334a5fb2327 diff --git a/qtbase b/qtbase index aa8d3f90..65cfac73 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit aa8d3f90a440575deef914916299b792105d7209 +Subproject commit 65cfac73bd1c09eafadf57a3b7161f52b186c37d diff --git a/qtconnectivity b/qtconnectivity index 35a5cf01..ea85065c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 35a5cf01fb6ad16c039867d4f8ad3a3171fcc3a2 +Subproject commit ea85065cbbc2c51482039384f82ab9bbf32104b1 diff --git a/qtdeclarative b/qtdeclarative index fb4c12a9..5af16fb4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fb4c12a9db86a4b886058cc937c3c20b798bd2e2 +Subproject commit 5af16fb4dfa39ead82240f5ffbc004634f3c288f diff --git a/qtdoc b/qtdoc index 786e974f..ca79f1fa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 786e974f338df0d4e98130c1b9d68f1e30c85eae +Subproject commit ca79f1fa85b0dd05daf12eba616049f22289f9ea diff --git a/qtquickcontrols b/qtquickcontrols index 44fe49e5..b31d58be 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 44fe49e573539e22709c2d5c996f1ca9ee8fd760 +Subproject commit b31d58be194c205decf087dacdc6bdb5cf443d71 diff --git a/qtrepotools b/qtrepotools index 64abf60a..f6f2b04b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 17b5efd7..a364970e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 17b5efd7bfdcb6afedb2ba5fbe263a86efb570f9 +Subproject commit a364970e8b94134bb7e895a353688683b9749c4e diff --git a/qtwebengine b/qtwebengine index e710d15b..02c01aed 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e710d15b7243f2fbc99f98c3ca79d325eb459ac7 +Subproject commit 02c01aedcc08525eea226382318f6a8585c3dae7 -- cgit v1.2.3 From 5db0ce74b7a681fb57f817751a7db3fe80e8c523 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Apr 2019 12:39:54 +0300 Subject: Provisioning: Update QNX 7.0 packages Updated packages includes QNX Multimedia Suite 2.0, which enables building QtMultimedia QNX plugins Task-number: QTBUG-71073 Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc Reviewed-by: Samuli Piippo --- coin/provisioning/common/linux/qnx_700.sh | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 3c821fec..02cd57d3 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz" -sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" +sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index a5547972..d2905e9d 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 74c8dc6b..b7a5230c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" Download $url $url $zip -Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" +Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" -- 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 b692cf823a317abd6149be8fdb497f328fb01555 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 29 Apr 2019 11:48:19 +0300 Subject: Adjust submodule branches Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6addc7..23d10fee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.13 + branch = 5.13.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.13 + branch = 5.13.0 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.13 + branch = 5.13.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.13 + branch = 5.13.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.13 + branch = 5.13.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,86 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.13 + branch = 5.13.0 status = preview -- 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 4c4595b93bbd8e4dd575d7444b18c8f8538395e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 May 2019 15:19:27 +0200 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0 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..22c1e10e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12b96dbb81a1a7bc5ffc08c24942038b007985e9 +Subproject commit 22c1e10e1955c63e3b1761e05ce06164c0464073 diff --git a/qtcharts b/qtcharts index beda274e..ea00b4ad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit beda274e7d8b5a6864b254a9e63b654f3c494139 +Subproject commit ea00b4ad6a88ca582a290c0a8fd17b28ac21481e 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..fd902c04 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7dc2d9302347b87993f5cfed4be5d6b9c3e130bc +Subproject commit fd902c04b912deb81f41da0cd216d2cb1c86289b 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..0a0c3eb7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4fe4d9664eff32568ff03868fc0cbe8b81ee3278 +Subproject commit 0a0c3eb7f4de0ef406e9fe4b3c4780dcdf0deb69 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..5d357f90 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b392921e33b4e8d425f1881afb95e6d34e53879c +Subproject commit 5d357f90951dde3cbae943dfa8ee44e0b952956d 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..5755e89a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d1a1b62914d592bf0bb382accff29abc610d3fab +Subproject commit 5755e89a9de6c60ac574759bc820a7b915b9ee62 diff --git a/qtserialbus b/qtserialbus index fe80eef6..c4baab78 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fe80eef6b3377c8727c5190d275808c343ee7c75 +Subproject commit c4baab78983f803a6956d10fb5ae53731340ab41 diff --git a/qtserialport b/qtserialport index f47d1b9a..313ad3f5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f47d1b9a11eb8c56afbd929285724f795097da09 +Subproject commit 313ad3f5ae210db495854bcbd92c70e0732461fb 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..475910a7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 458bc86f82f8fa6cfd659950549d1d2b36e5e40d +Subproject commit 475910a75a5cd3332fe2f0e5740c4c3c2c0b8987 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..395e61ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5de670283e3093fcdd2a91dcca30ffbe0b03d230 +Subproject commit 395e61ff2e51dc7c34ee05debd450846f027ea56 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 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 From 819362c5d6b56ebe707f8c6d0deb0d074f19822c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 May 2019 15:00:43 +0200 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 21 files changed, 21 insertions(+), 21 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 22c1e10e..4f5b2733 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22c1e10e1955c63e3b1761e05ce06164c0464073 +Subproject commit 4f5b2733b6e8be08177de628da55b8b22db9f707 diff --git a/qtcharts b/qtcharts index ea00b4ad..19fb5aa9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ea00b4ad6a88ca582a290c0a8fd17b28ac21481e +Subproject commit 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e9 diff --git a/qtconnectivity b/qtconnectivity index b4c225c7..8f2d6640 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b4c225c747d91122f7c145b337ad611c025c1ab6 +Subproject commit 8f2d6640f959e35a8fd033a50aa57cb13b673cbb diff --git a/qtdatavis3d b/qtdatavis3d index fd902c04..e4cd15e3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fd902c04b912deb81f41da0cd216d2cb1c86289b +Subproject commit e4cd15e388f675a80a9c257655a580b1b53c240a diff --git a/qtdoc b/qtdoc index 0a0c3eb7..c1c45f8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0a0c3eb7f4de0ef406e9fe4b3c4780dcdf0deb69 +Subproject commit c1c45f8d8cfe67b2605baad2ab72a4ec43aef3ec diff --git a/qtlocation b/qtlocation index 5d357f90..ca339bc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5d357f90951dde3cbae943dfa8ee44e0b952956d +Subproject commit ca339bc55d6fc617c63e723c43150445fc8ac050 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/qtremoteobjects b/qtremoteobjects index e69037fe..a8a3088f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e69037fe3160964d45920ee33d606ec2a72a6e3c +Subproject commit a8a3088f1fcd7ff00e7748040473c27c4bea8dad diff --git a/qtrepotools b/qtrepotools index 50529226..64abf60a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 50529226884176e3910f84a68fb260a3cb9fb3b2 +Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c diff --git a/qtscript b/qtscript index 73296231..9401306e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 732962319eeae2881890bd146146e7e6f486c9fb +Subproject commit 9401306e2db3a1756aab958d0939d12c8d5f46e0 diff --git a/qtsensors b/qtsensors index 5755e89a..299bbcdb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5755e89a9de6c60ac574759bc820a7b915b9ee62 +Subproject commit 299bbcdb59198910188ebe1abbae1d9868d8ae6d diff --git a/qtserialbus b/qtserialbus index c4baab78..56211334 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c4baab78983f803a6956d10fb5ae53731340ab41 +Subproject commit 562113342f2b232d38a3ea05e84b8d2584799218 diff --git a/qtserialport b/qtserialport index 313ad3f5..c1766c64 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 313ad3f5ae210db495854bcbd92c70e0732461fb +Subproject commit c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 diff --git a/qttools b/qttools index 7203e6a9..72eac2f5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7203e6a94ced619eadbc14aedf73d40530671662 +Subproject commit 72eac2f5f3d8ea839c915455e4eed66118d06505 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 475910a7..a658a10f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 475910a75a5cd3332fe2f0e5740c4c3c2c0b8987 +Subproject commit a658a10f6a42e67bd762f87851c23cc1c1e3b141 diff --git a/qtwebengine b/qtwebengine index 395e61ff..c453b750 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 395e61ff2e51dc7c34ee05debd450846f027ea56 +Subproject commit c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 diff --git a/qtx11extras b/qtx11extras index ce6b90e5..7e86e23e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ce6b90e597e93252a56d37e616fbd473e1ae8c33 +Subproject commit 7e86e23ee87f2450b3f7103632c3ad2ab082e5eb -- cgit v1.2.3 From 8cdf60fe6492490561cd6798901b201903ff6ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Feb 2019 14:51:55 +0200 Subject: Split features list between Coin and qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 55 ++++++++++++++++---------------- coin/platform_configs/qt3d-runtime.txt | 42 ++++++++++++------------ coin/platform_configs/qt5.txt | 42 ++++++++++++------------ coin/platform_configs/qtbase.txt | 12 +++---- coin/platform_configs/qtconnectivity.txt | 6 ++-- coin/platform_configs/qtdeclarative.txt | 8 ++--- coin/platform_configs/qtsaferenderer.txt | 6 ++-- coin/platform_configs/qtsdk.txt | 8 ++--- coin/platform_configs/qtwebkit.txt | 8 ++--- coin/platform_configs/tqtc-qt-rta.txt | 11 +++---- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 177d9aa6..d7c82bbd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,29 @@ -Template Target OS Target arch Compiler Target Compiler Features ------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -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.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.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 +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl +qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -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 +qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 314099ab..80319e1b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -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.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 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -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.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 +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 314099ab..80319e1b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -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.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 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -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.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 +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index e8e10354..7a4b85bf 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,6 +1,6 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -nomake examples -nomake tests -static -no-icu -release -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -developer-build -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -nomake examples -nomake tests -prefix /home/qt/work/install -static -verbose -xplatform wasm-emscripten diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 15f11bd1..c5237cf8 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -static -no-icu -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index e2b69559..8e9e48fb 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index ec14f610..3c000ec2 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples +Template Target OS Target arch Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- ------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt index 3011926d..ad320b09 100644 --- a/coin/platform_configs/qtsdk.txt +++ b/coin/platform_configs/qtsdk.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 27782f88..9e1c893f 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8fbb5a00..82b086f9 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,6 +1,5 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------- -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-8.1-x86_64 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -- cgit v1.2.3 From a66a54035c707138eb56744993639b5989074f70 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 May 2019 17:00:47 +0200 Subject: Update submodules on 'dev' in qt5 Temporarily ignore qt3d until it got fixed correctly. Task-number: QTBUG-75384 Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8 Reviewed-by: Liang Qi --- .gitmodules | 2 +- 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 +- qtlottie | 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 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5bd390c4..50abffc4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = dev - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qt3d b/qt3d index 100175e9..5679b23c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 100175e92d6adb346169eda0392b9485ca41a905 +Subproject commit 5679b23c5338ae41d12755cf4e26a95bc391d0a9 diff --git a/qtactiveqt b/qtactiveqt index 619d6d2f..2d740d31 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 619d6d2fe683cfb74ff8d45ec99e8570b5261b0e +Subproject commit 2d740d313342a014169d5f317da53e499ff4432e diff --git a/qtandroidextras b/qtandroidextras index 72e8372e..ecdf7177 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 72e8372e7d15cfb5fff11ae9272398e8a2e32efd +Subproject commit ecdf7177b90c8c5de060da076b12e4869e57b4d5 diff --git a/qtbase b/qtbase index 8f44aeb1..add4b56b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8f44aeb10317664dd7cae92e628fb0814e432e17 +Subproject commit add4b56b21bae5cef222ee23e00707664ca50e7f diff --git a/qtcharts b/qtcharts index 4618124a..9e28f427 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4618124ada61c28eefc3ab89fd151c0f9fbbba71 +Subproject commit 9e28f427009ee3cd25b4d1a8cd446049d51152a4 diff --git a/qtconnectivity b/qtconnectivity index 21bfb762..76b6b054 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21bfb7620f3cdcaf3d2b7c0b8a2294e174c7053b +Subproject commit 76b6b0544fa71372e98a76a96a9f9b300bb67b7e diff --git a/qtdatavis3d b/qtdatavis3d index afe8f78d..21583347 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit afe8f78d360eab894e6e85ecd72c75d8f365e6bb +Subproject commit 215833472171b17db506d49646c639b4fff926ab diff --git a/qtdeclarative b/qtdeclarative index 2ccd4c36..12829b50 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2ccd4c3672e5db2c25ca0f8df439fe8f646aa942 +Subproject commit 12829b50fc85587c9c08c834efd63ebe8ccbbcd2 diff --git a/qtdoc b/qtdoc index 0c3bd91b..9debad60 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0c3bd91bb653c6cfff24927c1074dcca1597e716 +Subproject commit 9debad60b88ffb51f50d111f9b4f871f5418622b diff --git a/qtgamepad b/qtgamepad index 3cf4be21..337abe99 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 3cf4be211ad58425d89c238b23bec5cedd79c111 +Subproject commit 337abe99492d7d6d5229b615fa1559fc2f4ee6eb diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c6fe3e3b..fe2eefc0 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c6fe3e3be58efa4002876ad2b5c811355d1b21f0 +Subproject commit fe2eefc036f3f42457e7f2e012f21fdec84550eb diff --git a/qtimageformats b/qtimageformats index 155410fd..9a4a2dd5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 155410fd6369ceafccb865a9d0fe2169c63a7368 +Subproject commit 9a4a2dd5189e1659bce46eacef513b0c5680bb1e diff --git a/qtlocation b/qtlocation index 5c53cd23..0cf1f9e5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5c53cd23351a1850f170dcf2fdcab7545cac3ddc +Subproject commit 0cf1f9e5cfaf3fdab8f7dcf1d07bb67bda66020c diff --git a/qtlottie b/qtlottie index 80151882..254ea99a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 80151882a9a806f5fdbb700fd6a0db1300d9d5e0 +Subproject commit 254ea99abd181abe5468b7cc5ece0e2ae51da185 diff --git a/qtmacextras b/qtmacextras index 944a5c66..ca1414e6 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 944a5c66b725d3fefa8989c74ed62e0395d6bcff +Subproject commit ca1414e6b7ce219efa86e965a5c031b79e7a604e diff --git a/qtmultimedia b/qtmultimedia index 2755dcf6..6e09ab1e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2755dcf670f8b40ec2f3ecce356b378db08da872 +Subproject commit 6e09ab1ef5b35b430270016895062d604729f658 diff --git a/qtnetworkauth b/qtnetworkauth index 2b1e9bfe..8bc6feb3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2b1e9bfec5b6017f3e16dfc6c8df94523aefe286 +Subproject commit 8bc6feb36a471006cfa4b62189edc3d7fd67bf78 diff --git a/qtpurchasing b/qtpurchasing index 0992ba9d..91fc2ee3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0992ba9d0c78ab99fe7387d1e53cad0e9db0ff45 +Subproject commit 91fc2ee34cfd674d134e88dc7f3c54453ec685e7 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 bdff4deb..d2a661f1 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bdff4debf5f3f8125e3b7876bb5c62bc4251727f +Subproject commit d2a661f16e9982c45260efb9875b83c581b82287 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d1fdbd12..73fa6425 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d1fdbd128f6e95255c7d9fc20ef07f44677a649e +Subproject commit 73fa64256eaad072cc64569e9a38a59d287a414a diff --git a/qtremoteobjects b/qtremoteobjects index 6272bab4..fdb3bfa8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6272bab4eb61f39cfe4ada059f528c8d00246732 +Subproject commit fdb3bfa87792a9c4d03b53b3b6fcb5c002aefc4f diff --git a/qtrepotools b/qtrepotools index df3090cb..64abf60a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 +Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c diff --git a/qtscript b/qtscript index fc997508..583dcc6d 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fc99750865129c3abe9c827dd136ab717a7f4601 +Subproject commit 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 diff --git a/qtscxml b/qtscxml index 96b43552..01bc8df0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 96b435525b17f1e16be953e01cd1f573e4342c2f +Subproject commit 01bc8df0760e14449ca7d5b6c187bf9870efbd3d diff --git a/qtsensors b/qtsensors index 9b309ffa..6a8e8a64 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9b309ffa389f58f3a87bf132e123ae78aee808a3 +Subproject commit 6a8e8a64d3473c5ff890c022b738862a704516dc diff --git a/qtserialbus b/qtserialbus index 960861ac..f12d420e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 960861ac561f4bd4d8ce4fbe6d0643482d961f11 +Subproject commit f12d420e8492b85e8aa2a7982e81a88cb1098d6c diff --git a/qtserialport b/qtserialport index f03f1476..450156f3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f03f1476fb1d95dff3dab3ecf2db8ca6edb0e013 +Subproject commit 450156f37356f67f217de760a5df3149684dd99f diff --git a/qtspeech b/qtspeech index 6b3d03f5..5cf744a0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6b3d03f56f4f58121f21f9fe38f51ce45d0130a8 +Subproject commit 5cf744a096bb079bd33e417e9fb62a6d6726a3a3 diff --git a/qtsvg b/qtsvg index 798f3010..1983ba1d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 798f3010b1b6fe14b3bb56f136b7f126b8144398 +Subproject commit 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 diff --git a/qttools b/qttools index 2ba9cc9a..63f9cc37 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2ba9cc9aad6fbd950ac4aa090f6480a500679ea2 +Subproject commit 63f9cc3763c79391ea10a99462c8081a91d1f75d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 039e3e85..fe52858d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 039e3e85f9c3b4cd4980fa944e321f7009b93fd0 +Subproject commit fe52858df5c641eb9fb0df02e33d5b328d6b00e7 diff --git a/qtwayland b/qtwayland index 838de08e..4ab3cbcc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 838de08ed24c947be9ea3c311afc1556e62be9fc +Subproject commit 4ab3cbcc5c4da6384e9081993c5ba24303a382bd diff --git a/qtwebchannel b/qtwebchannel index aa490ada..6031bd7b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit aa490ada3793fc3528bdfefb90479c711cc0c325 +Subproject commit 6031bd7bfdf97c492f9f11b4bd0a5375613b55de diff --git a/qtwebengine b/qtwebengine index aef55c40..5d6086d1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aef55c4091f252231718369b382dd8f401f206e3 +Subproject commit 5d6086d1b97461b35c143839a8a6ba1b990bb87c diff --git a/qtwebsockets b/qtwebsockets index 6dd15c9f..2e54dbe8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6dd15c9f1bfdc010e4cd4b8158435063a5a7d229 +Subproject commit 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 diff --git a/qtwebview b/qtwebview index 9dcc8033..fac66332 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9dcc803346ab9c999ada37e06e2a508dc61307f5 +Subproject commit fac66332c76e2fc9c29aa2508a41cd9392825d25 diff --git a/qtwinextras b/qtwinextras index 65dbe51c..878d6226 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 65dbe51cf3d61e4629178569721b26649d649b82 +Subproject commit 878d6226f2472b3dff192207aa0c2a03eb4d3465 diff --git a/qtx11extras b/qtx11extras index e1e4d843..821e5be0 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit e1e4d843a0d9b18d29c4c8e45bc3c1e5fcabc863 +Subproject commit 821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea diff --git a/qtxmlpatterns b/qtxmlpatterns index 1a2dca88..e5582749 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1a2dca888989cd332053d4738e24cd81779cf008 +Subproject commit e5582749e285ff22b634b1e7d0a37f076b2a7be3 -- cgit v1.2.3 From 192372bb56374d5299bab40df81f0cfc9f93871a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 9 May 2019 15:33:53 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index add4b56b..7dd71e81 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit add4b56b21bae5cef222ee23e00707664ca50e7f +Subproject commit 7dd71e812542c561a00dd792d314843a81c5687c diff --git a/qtconnectivity b/qtconnectivity index 76b6b054..16e37407 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 76b6b0544fa71372e98a76a96a9f9b300bb67b7e +Subproject commit 16e37407cd6ad369d5250de1b9dac83083a45200 diff --git a/qtdeclarative b/qtdeclarative index 12829b50..005edd12 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 12829b50fc85587c9c08c834efd63ebe8ccbbcd2 +Subproject commit 005edd128aa5acc3321e32e714954a17dd9451b2 diff --git a/qtmultimedia b/qtmultimedia index 6e09ab1e..2a8d9b8b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e09ab1ef5b35b430270016895062d604729f658 +Subproject commit 2a8d9b8b998f0ce45651157377b3491b9997bcf8 diff --git a/qtwayland b/qtwayland index 4ab3cbcc..17b1705c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4ab3cbcc5c4da6384e9081993c5ba24303a382bd +Subproject commit 17b1705ce4c8bc9ca19a6b424a00a045134b3aac -- cgit v1.2.3 From 494d10fb7321168d650ebcd98fcd5f1439f71907 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 9 May 2019 12:05:43 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index e4e5a1f0..2a79af6b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4e5a1f0b7f85b4c8b593a06a67d83f5be09004e +Subproject commit 2a79af6b5c67eba6f967c7443bf73bbe11206a62 diff --git a/qtdeclarative b/qtdeclarative index bb882f43..0a775ded 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bb882f433b6cf6fca56049df6b654fb6a39a7cab +Subproject commit 0a775ded35acf7172e3f852d55de7e28a5370653 diff --git a/qtlocation b/qtlocation index a6ac8739..ca339bc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a6ac8739a23c4101a3c582aa89281aa90027128f +Subproject commit ca339bc55d6fc617c63e723c43150445fc8ac050 diff --git a/qtremoteobjects b/qtremoteobjects index e69037fe..a8a3088f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e69037fe3160964d45920ee33d606ec2a72a6e3c +Subproject commit a8a3088f1fcd7ff00e7748040473c27c4bea8dad diff --git a/qtrepotools b/qtrepotools index a2e59d28..64abf60a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a2e59d2879f1071fca7345e5888927cdcc64c9a0 +Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c diff --git a/qttools b/qttools index 0f92411b..8a362d11 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0f92411b53d653b0285f7c8919b2a682808167e5 +Subproject commit 8a362d110a2376ba0b112621db67ee58b3bb5d87 diff --git a/qttranslations b/qttranslations index 88266670..e943786f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 88266670663256f40019e7163092e17401557d5f +Subproject commit e943786fb89d82212d1ad177725fe30c582864a3 diff --git a/qtwayland b/qtwayland index 35766558..a658a10f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 35766558ae55fb6b72b9fe640702c950832ca8c2 +Subproject commit a658a10f6a42e67bd762f87851c23cc1c1e3b141 diff --git a/qtwebengine b/qtwebengine index c453b750..99d46a8a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 +Subproject commit 99d46a8a918dee7323bc3d4f1624c47c097f9a3a -- cgit v1.2.3 From 9c492849787183660bf5b06c3cd69d32ba9d033c Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Fri, 10 May 2019 16:08:08 +0300 Subject: Remove redundant windows configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The windows configuration was added by commit 8cdf60fe6492490561cd6798901b201903ff6ab2 which was unintended and caused breakages due to wrong library paths. Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which allowed sharing storage paths with builds with different configure arguments. Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d7c82bbd..77f23f05 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,7 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -- cgit v1.2.3 From 7d1d1aa2d2cdcddce3c7deb4686be0e1f3d7bef9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 May 2019 11:15:18 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 2a79af6b..59111649 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a79af6b5c67eba6f967c7443bf73bbe11206a62 +Subproject commit 591116490cf313808e8ba05ddd066656a1d1a566 diff --git a/qtqa b/qtqa index 604a768d..5f9ea5ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 +Subproject commit 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd2 diff --git a/qttools b/qttools index 8a362d11..24218dfb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8a362d110a2376ba0b112621db67ee58b3bb5d87 +Subproject commit 24218dfbad58d5f5a50f7f274f315e852fca6b50 -- cgit v1.2.3 From e6c0dc1d600584ad0f4404e57bc38b2d16d512da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 May 2019 20:39:10 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 7dd71e81..a0c4b6f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dd71e812542c561a00dd792d314843a81c5687c +Subproject commit a0c4b6f34546bdd22167a76a0540d37e9a37c0cf diff --git a/qtdeclarative b/qtdeclarative index 005edd12..3fff0304 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 005edd128aa5acc3321e32e714954a17dd9451b2 +Subproject commit 3fff03048a48aa7ead6e888165b2ae5a118d675c diff --git a/qtlocation b/qtlocation index 0cf1f9e5..971423c5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0cf1f9e5cfaf3fdab8f7dcf1d07bb67bda66020c +Subproject commit 971423c512623b84618cfc73b992da1f1dc014f8 diff --git a/qtmultimedia b/qtmultimedia index 2a8d9b8b..f0f354f2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2a8d9b8b998f0ce45651157377b3491b9997bcf8 +Subproject commit f0f354f2a1eec54733c871bf735f67e0c4ea945c diff --git a/qtqa b/qtqa index 604a768d..5f9ea5ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 +Subproject commit 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 73fa6425..da150dac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 73fa64256eaad072cc64569e9a38a59d287a414a +Subproject commit da150dacec8a2a68d290141b1e0ab268ce648edb diff --git a/qtremoteobjects b/qtremoteobjects index fdb3bfa8..99df6cb9 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit fdb3bfa87792a9c4d03b53b3b6fcb5c002aefc4f +Subproject commit 99df6cb9fc2cd598dd33c89e7781f5963b739508 diff --git a/qttools b/qttools index 63f9cc37..ee122e6a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 63f9cc3763c79391ea10a99462c8081a91d1f75d +Subproject commit ee122e6a0752634ed9dddf0937fa386709059c75 diff --git a/qtwayland b/qtwayland index 17b1705c..14d37a53 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 17b1705ce4c8bc9ca19a6b424a00a045134b3aac +Subproject commit 14d37a53a674d7dbef32e718ae391e265fad5fac diff --git a/qtwebengine b/qtwebengine index 5d6086d1..0c2beb49 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5d6086d1b97461b35c143839a8a6ba1b990bb87c +Subproject commit 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 -- cgit v1.2.3 From 2e028e620df1636436c3d796622f867787058e29 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 10 May 2019 10:03:51 +0200 Subject: Bring qt3d back Task-number: QTBUG-75384 Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d Reviewed-by: Liang Qi --- .gitmodules | 2 +- qt3d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 50abffc4..5bd390c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = dev - status = ignore + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qt3d b/qt3d index 5679b23c..b0db56de 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5679b23c5338ae41d12755cf4e26a95bc391d0a9 +Subproject commit b0db56ded0f38e9f59f379c6ff80b668ed49c743 -- cgit v1.2.3 From 991500dc85ca1aceaa1ec8bac1c79b9b6e46deac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 May 2019 08:46:00 +0200 Subject: Update submodules on '5.13.0' in qt5 Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/qt3d b/qt3d index e9642824..7640c5d5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e9642824244fa9fe55dca2cef8e002192a4f1b17 +Subproject commit 7640c5d526d10e0397e9f2e712139433165d269f diff --git a/qtactiveqt b/qtactiveqt index 21a27816..8431aa7b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 21a27816e66c8bea33b3ee28221df4b0c6ee9baf +Subproject commit 8431aa7b6de9baf22780f97edcf48c7300f26c39 diff --git a/qtandroidextras b/qtandroidextras index 17985125..00fac652 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 17985125ca974456900bca463b98a47af9ce4970 +Subproject commit 00fac6523b1c276933903ca39e68392dd8bbbbc6 diff --git a/qtbase b/qtbase index 4f5b2733..3803b41e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f5b2733b6e8be08177de628da55b8b22db9f707 +Subproject commit 3803b41eaecb6c1686aba88b4226486507aca094 diff --git a/qtcharts b/qtcharts index 19fb5aa9..7c50ad36 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e9 +Subproject commit 7c50ad366e8e40996a3b75a31b9834f6f667bde6 diff --git a/qtdatavis3d b/qtdatavis3d index e4cd15e3..cc7f4769 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e4cd15e388f675a80a9c257655a580b1b53c240a +Subproject commit cc7f4769a02421575c9f5a61d9b3687af79201dd diff --git a/qtdeclarative b/qtdeclarative index bb882f43..ecc092fa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bb882f433b6cf6fca56049df6b654fb6a39a7cab +Subproject commit ecc092fa5519e77a47ef560f0137b4cd5f417c5e diff --git a/qtdoc b/qtdoc index c1c45f8d..003ff5d3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c1c45f8d8cfe67b2605baad2ab72a4ec43aef3ec +Subproject commit 003ff5d316e8e48df92bb64636c02d1602881031 diff --git a/qtgamepad b/qtgamepad index 653900f1..7d610c6b 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 653900f1d4801f184ddd9725f0806406a4021b8b +Subproject commit 7d610c6b1a437235cba38848c1af9afd5556dc73 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fc823235..417dff66 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fc82323538ffde51ab03a38db4d6e61b372a091e +Subproject commit 417dff666bd5a9e5a09b67780b0ffa8a496cbe92 diff --git a/qtimageformats b/qtimageformats index dabcde31..a743e142 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit dabcde3195e47683b31f0050c5de067863eb64e5 +Subproject commit a743e1427b4ce9b4f1c43d3456679c09cee7b4e0 diff --git a/qtmacextras b/qtmacextras index 1196b92a..914f62dc 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 1196b92a6428b22c56f1df3fc70337c02972d9d0 +Subproject commit 914f62dcd109f726af0ffd771cafa0228862312d diff --git a/qtmultimedia b/qtmultimedia index 268d78ca..f5c4fdd1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 268d78ca745bf7d54545e51a4f22e2fa24a8675c +Subproject commit f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047 diff --git a/qtnetworkauth b/qtnetworkauth index f52ff01d..8bc01cbf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f52ff01d38400d5343af9149414f3573580a2405 +Subproject commit 8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab diff --git a/qtpurchasing b/qtpurchasing index f9ab1500..d7b00a49 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f9ab15009bdc249d4f19513fc9730d81f5b50fe5 +Subproject commit d7b00a49803412caf6a0b415974ff2f4c3adf7f7 diff --git a/qtqa b/qtqa index 604a768d..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtquickcontrols b/qtquickcontrols index 44fe49e5..5f7e823d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 44fe49e573539e22709c2d5c996f1ca9ee8fd760 +Subproject commit 5f7e823d67e615727c8e36aafc6baadfc105c67f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 324ec97a..a87188ac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 324ec97aa256549c56d506fd96c1e06c35fed1ae +Subproject commit a87188ace95ad9818e078aae72cfab7ea4a9cfaa diff --git a/qtscxml b/qtscxml index 68c9234b..cb8388ac 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 68c9234b67ca0939fcf6607d87bda90b93170567 +Subproject commit cb8388ac1de37ff31786cd1bd4723938b76d0f0a diff --git a/qtsensors b/qtsensors index 299bbcdb..ce508999 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 299bbcdb59198910188ebe1abbae1d9868d8ae6d +Subproject commit ce508999540cb125dad40dd250b17e6ad20d542b diff --git a/qtserialport b/qtserialport index c1766c64..2f2b747e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 +Subproject commit 2f2b747ebc4dd982caede82a0a931ad73e4cd462 diff --git a/qtspeech b/qtspeech index bda364fe..97207267 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit bda364fe3df7dd6269e2d284fcc2c6d239a962b7 +Subproject commit 97207267b4b41f41148a25e08d546c975411762f diff --git a/qtsvg b/qtsvg index 7e7ed705..3a4c6342 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7e7ed705efc51134b27820d76beceefc62ab0b3d +Subproject commit 3a4c634241f7271ddfbb840a42d6bf863b46ccea diff --git a/qttools b/qttools index 72eac2f5..baac552c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 72eac2f5f3d8ea839c915455e4eed66118d06505 +Subproject commit baac552c6822c10b509a1fbb1fae6b3ba9d58af2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 17b5efd7..2413bc23 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 17b5efd7bfdcb6afedb2ba5fbe263a86efb570f9 +Subproject commit 2413bc23c5f9995752fdd03d56e480d661fc6fbc diff --git a/qtwayland b/qtwayland index a658a10f..fb7aa15c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a658a10f6a42e67bd762f87851c23cc1c1e3b141 +Subproject commit fb7aa15c2a27a9dc841806d07aee9c39aa3fb2ef diff --git a/qtwebchannel b/qtwebchannel index 11c8706b..fdba7f6e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 11c8706b6c0ca3f9c0d195641fd0eea816899acd +Subproject commit fdba7f6e285d35757190d99f9880e3bd0380e254 diff --git a/qtwebengine b/qtwebengine index c453b750..893ebeff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 +Subproject commit 893ebeffb4b55df07257b035aeab6fad14224f22 diff --git a/qtwebglplugin b/qtwebglplugin index c21dbf12..15637e6d 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit c21dbf122e57ee90436de65a7f868fd8ce5a377b +Subproject commit 15637e6d824bca5d149147207a98cbc016fbbef6 diff --git a/qtwebview b/qtwebview index 159945f8..3265fa96 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 159945f822e098d8d169ec1379675d8a664cea9e +Subproject commit 3265fa961a27894faa5b3413fb39c8682266a72f diff --git a/qtwinextras b/qtwinextras index 1ec9cfb3..f34f404c 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 1ec9cfb3379b40132f8d61a6b8b9145df4ac0a09 +Subproject commit f34f404cedd6d3005ecb4a30ebdd18c1df8a2189 diff --git a/qtxmlpatterns b/qtxmlpatterns index 9cfa05ed..29891df4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9cfa05ed8beb0a9f323070060115e56064be9f3a +Subproject commit 29891df4ce099542635e33891945ba19f3e9572c -- cgit v1.2.3 From 3e6a04c09d8457d64b6dd3d6d95b9d3adb8b3413 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 15 May 2019 11:09:51 +0200 Subject: qtdeclarative platform config: Add missing quotes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 8e9e48fb..a36c94a5 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb -- cgit v1.2.3 From 230a73409a2fe58e7de0674107a2d870be0bf03d Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 11 Apr 2019 12:24:45 +0300 Subject: Provision sed for windows 10 Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/helpers.ps1 | 12 +++++ coin/provisioning/common/windows/install-sed.ps1 | 60 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/09-install-sed.ps1 | 1 + 3 files changed, 73 insertions(+) create mode 100644 coin/provisioning/common/windows/install-sed.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f5318bcb..6e8e0365 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -136,6 +136,18 @@ function Add-Path $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } +function Prepend-Path +{ + Param ( + [string]$Path + ) + Write-Host "Adding $Path to Path" + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", "$Path;" + $oldPath, [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +} + function Set-EnvironmentVariable { Param ( diff --git a/coin/provisioning/common/windows/install-sed.ps1 b/coin/provisioning/common/windows/install-sed.ps1 new file mode 100644 index 00000000..2e1cbcd4 --- /dev/null +++ b/coin/provisioning/common/windows/install-sed.ps1 @@ -0,0 +1,60 @@ +############################################################################ +## +## 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 sed and it's dependencies + +$prog = "sed" +$version = "4.2.1" +$sha1 = "dfd3d1dae27a24784d7ab40eb074196509fa48fe" +$dep_sha1 = "f7edbd7152d8720c95d46dd128b87b8ba48a5d6f" +$pkg = "$prog-$version-bin.zip" +$dep_pkg = "$prog-$version-dep.zip" +$cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$pkg" +$dep_cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$dep_pkg" +$install_location = "c:\Utils\$prog" + +$tmp_location = "c:\users\qt\downloads" +Download $cached_url $cached_url "$tmp_location\$pkg" +Verify-Checksum "$tmp_location\$pkg" $sha1 sha1 +Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg" +Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1 + +Extract-7Zip "$tmp_location\$pkg" $install_location +Extract-7Zip "$tmp_location\$dep_pkg" $install_location +Remove "$tmp_location\$pkg" +Remove "$tmp_location\$dep_pkg" + +Prepend-Path "$install_location\bin" +Write-Output "sed = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" -- cgit v1.2.3 From 5677a43a25a9dc1a3151e6b28cbf9fe015a1aff4 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 16 May 2019 10:07:51 +0200 Subject: Remove platforms from Qt 6 Get to a smaller set to reduce load on the CI and have faster turnaround times while developing. Remove some older compilers that do not support the minimum C++ feature set we want to require for Qt 6. We'll need to revisit and probably expand this set when we get closer to releasing Qt 6. Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 10 ---------- coin/platform_configs/qtbase.txt | 1 - 2 files changed, 11 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 77f23f05..47b7e842 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,18 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 7a4b85bf..899376ce 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -2,5 +2,4 @@ Template Target OS Target arch Compiler Fe --------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -nomake examples -nomake tests -static -no-icu -release -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -developer-build -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -nomake examples -nomake tests -prefix /home/qt/work/install -static -verbose -xplatform wasm-emscripten -- cgit v1.2.3 From edc39be08b55f07abdb29c6ba3527fd31e6b928d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 13 May 2019 17:11:00 +0200 Subject: Fix qtdeclarative boot2qt CI config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DISTRO_OPTS was missing quotes. The same thing is also done in 3e6a04c09d8457d64b6dd3d6d95b9d3adb8b3413. Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129 Reviewed-by: Aapo Keskimolo (cherry picked from commit 04fa1bf4ef48599973eceef5c3008ce7ca72a25b) Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 8e9e48fb..a36c94a5 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb -- cgit v1.2.3 From 47225925c56f2d959de905b774944ad6c4b6af41 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 May 2019 14:01:42 +0200 Subject: Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331 Reviewed-by: Liang Qi --- qt3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index b0db56de..fd748aba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0db56ded0f38e9f59f379c6ff80b668ed49c743 +Subproject commit fd748abaab7c1369613be2754e614041a0339502 diff --git a/qtconnectivity b/qtconnectivity index 16e37407..6b9469b1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16e37407cd6ad369d5250de1b9dac83083a45200 +Subproject commit 6b9469b1a229486986f572af09459dacce5795de diff --git a/qtdeclarative b/qtdeclarative index 3fff0304..7257358e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3fff03048a48aa7ead6e888165b2ae5a118d675c +Subproject commit 7257358e44b373ebdd147162f7b5596d27420e7b diff --git a/qtdoc b/qtdoc index 9debad60..81061285 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9debad60b88ffb51f50d111f9b4f871f5418622b +Subproject commit 81061285220ccada412d4891f2a76867844dd883 diff --git a/qtmultimedia b/qtmultimedia index f0f354f2..afca8928 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f0f354f2a1eec54733c871bf735f67e0c4ea945c +Subproject commit afca8928ce8e4113a224e57fa30a3b4bc5a2db47 diff --git a/qtqa b/qtqa index 5f9ea5ce..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd2 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtremoteobjects b/qtremoteobjects index 99df6cb9..0f628fc1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 99df6cb9fc2cd598dd33c89e7781f5963b739508 +Subproject commit 0f628fc1ac247a88bc68e3b3977aa9802c1129bc diff --git a/qtserialbus b/qtserialbus index f12d420e..fdf0ff9d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f12d420e8492b85e8aa2a7982e81a88cb1098d6c +Subproject commit fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e diff --git a/qttools b/qttools index ee122e6a..770ef385 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ee122e6a0752634ed9dddf0937fa386709059c75 +Subproject commit 770ef38581c95df9c8bf378e8446ecd2df91e549 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe52858d..460a7cee 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe52858df5c641eb9fb0df02e33d5b328d6b00e7 +Subproject commit 460a7cee80e21df752501161c91b08c2059612fb diff --git a/qtwayland b/qtwayland index 14d37a53..03ac8d67 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 14d37a53a674d7dbef32e718ae391e265fad5fac +Subproject commit 03ac8d67fb6a94ae9c28325e306fd4291fde8bb6 diff --git a/qtwebengine b/qtwebengine index 0c2beb49..0f081baa 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 +Subproject commit 0f081baa31facec779057de29eec14c6f458f6a6 diff --git a/qtwebview b/qtwebview index fac66332..0a8a69d5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fac66332c76e2fc9c29aa2508a41cd9392825d25 +Subproject commit 0a8a69d51042b95649dbdf471acb3c96228f372e diff --git a/qtxmlpatterns b/qtxmlpatterns index e5582749..55c62fdd 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e5582749e285ff22b634b1e7d0a37f076b2a7be3 +Subproject commit 55c62fdd9cc1f9ec0fc18c6b4d804d9cb065dce0 -- cgit v1.2.3 From b7c0e2db784b0fb392d61a64ab0c2243df2acf6d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 May 2019 08:42:01 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b Reviewed-by: Katja Marttila --- qtbase | 2 +- qtdoc | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 3803b41e..ca0f85da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3803b41eaecb6c1686aba88b4226486507aca094 +Subproject commit ca0f85da82252057894401ada4c2daac63d770bb diff --git a/qtdoc b/qtdoc index 003ff5d3..12660189 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 003ff5d316e8e48df92bb64636c02d1602881031 +Subproject commit 12660189b5ef1efe729de76b35794c5957c578c4 diff --git a/qtremoteobjects b/qtremoteobjects index a8a3088f..e7b07a60 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a8a3088f1fcd7ff00e7748040473c27c4bea8dad +Subproject commit e7b07a60408285128dedb373316801294ca941b0 diff --git a/qtserialbus b/qtserialbus index 56211334..b18c452f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 562113342f2b232d38a3ea05e84b8d2584799218 +Subproject commit b18c452fdbe09c54caacb4323dea65b3746485e5 diff --git a/qttools b/qttools index baac552c..e363e640 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit baac552c6822c10b509a1fbb1fae6b3ba9d58af2 +Subproject commit e363e6400afaa4ddc691bfb5796efd34ecd4f4a8 diff --git a/qtwebengine b/qtwebengine index 893ebeff..0835dfa3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 893ebeffb4b55df07257b035aeab6fad14224f22 +Subproject commit 0835dfa3f9b2b20f6f40ee0c2140d5222ed4fff5 -- cgit v1.2.3 From 3e838f2a34d0c1538535bd184aa12681497c8a38 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 14 ++-- coin/platform_configs/qt3d-runtime.txt | 2 +- coin/platform_configs/qt5.txt | 2 +- .../common/linux/openssl_for_android_linux.sh | 38 +++++---- coin/provisioning/common/macos/install_openssl.sh | 81 ------------------ coin/provisioning/common/unix/install-openssl.sh | 91 +++++++++++++++++++++ .../common/windows/android-openssl.ps1 | 33 +++++--- coin/provisioning/common/windows/openssl.ps1 | 6 +- .../09-install-openssl.sh | 6 ++ .../09-install-openssl.sh | 6 ++ .../10-openssl_for_android_linux.sh | 43 ---------- .../50-openssl_for_android_linux.sh | 43 ++++++++++ .../09-install-openssl.sh | 6 ++ .../10-openssl_for_android_linux.sh | 39 --------- .../50-openssl_for_android_linux.sh | 39 +++++++++ .../09-install-openssl.sh | 6 ++ .../qtci-macos-10.12-x86_64/35-openssl.sh | 2 +- .../qtci-macos-10.13-x86_64/35-openssl.sh | 2 +- .../10-openssl_for_android.ps1 | 1 - .../50-openssl_for_android.ps1 | 1 + .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 95 +++++++++++++++++++++- 21 files changed, 348 insertions(+), 208 deletions(-) delete mode 100755 coin/provisioning/common/macos/install_openssl.sh create mode 100755 coin/provisioning/common/unix/install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh delete 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/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 77f23f05..6d578eda 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,19 +7,19 @@ qtci-windows-10-x86_64-14 MSVC2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}} +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}} qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}} qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a -qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 80319e1b..802fd326 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 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 80319e1b..802fd326 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 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 09d0b6d5..d833975f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -35,32 +35,38 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. - +set -ex # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2p" +exports_file="/tmp/export.sh" +# source previously made environmental variables. +if uname -a |grep -q "Ubuntu"; then + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file + rm -rf "$exports_file" +else + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file + rm -rf "$exports_file" +fi + +version="1.1.1b" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -installFolder="/home/qt/" -sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" -# Until every VM doing Linux Android builds have provisioned the env variable -# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. -# QTQAINFRA-1436 -opensslHome="${installFolder}openssl-1.0.2" - +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +mkdir -p "${HOME}/openssl/android/" +tar -xzf "$targetFile" -C "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "$installFolder" -# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}p" "${opensslHome}" -pushd "$opensslHome" - -echo "Running configure" -perl Configure shared android +TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin +cd "$opensslHome" +PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm +PATH=$TOOLCHAIN:$PATH CC=clang make build_generated SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh deleted file mode 100755 index 3b1978e2..00000000 --- a/coin/provisioning/common/macos/install_openssl.sh +++ /dev/null @@ -1,81 +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 install OpenSSL - -set -ex - -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -openssl_install_dir=/usr/local/openssl-$opensslVersion -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=$openssl_install_dir -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s $openssl_install_dir $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" -SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" -SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh new file mode 100755 index 00000000..afc1509e --- /dev/null +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script install OpenSSL from sources. +# Requires GCC and Perl to be in PATH. +set -ex +os="$1" +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +version="1.1.1b" +officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" +targetFile="/tmp/openssl-$version.tar.gz" +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl-${version}" +opensslSource="${opensslHome}-src" +DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +tar -xzf "$targetFile" -C "$HOME" +mv "$opensslHome" "$opensslSource" +cd "$opensslSource" +pwd + +if [[ "$os" == "linux" ]]; then + ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" + make && make install_sw install_ssldirs + SetEnvVar "OPENSSL_HOME" "$opensslHome" +elif [ "$os" == "macos" ]; then + # Below target location has been hard coded into Coin. + # QTQAINFRA-1195 + openssl_install_dir=/usr/local/openssl-$version + opensslTargetLocation="/usr/local/opt/openssl" + sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack" + echo "Running 'make' for OpenSSL" + # shellcheck disable=SC2024 + sudo make --silent > /tmp/openssl_make.log 2>&1 + echo "Running 'make install' for OpenSSL" + # shellcheck disable=SC2024 + sudo make --silent install > /tmp/openssl_make_install.log 2>&1 + + path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') + sudo mkdir -p "$path" + sudo ln -s $openssl_install_dir $opensslTargetLocation + + SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" + SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" + + SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" + SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" + SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" + + security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null + security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +fi + + +echo "OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index cf144c90..981fa51d 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -35,33 +35,40 @@ . "$PSScriptRoot\helpers.ps1" +if (Is64BitWinHost) { + $msys_bash = "C:\Utils\msys64\usr\bin\bash" +} else { + $msys_bash = "C:\Utils\msys32\usr\bin\bash" +} + # OpenSSL need to be configured from sources for Android build in windows 7 # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.0.2p" +$version = "1.1.1b" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c" +$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" $destination = "C:\Utils\openssl-android-master" +# msys unix style paths +$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$openssl_path = "/c/Utils/openssl-android-master" +$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 -Extract-7Zip $zip C:\Utils -Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils -Rename-Item C:\Utils\openssl-$version $destination +Extract-7Zip $zip C:\Utils\tmp +Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp +Move-Item C:\Utils\tmp\openssl-${version} $destination Remove-Item -Path $zip -Remove-Item C:\Utils\openssl-$version.tar - -# Make sure configure for openssl has a "make" and "perl" available -$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" Write-Host "Configuring OpenSSL $version for Android..." Push-Location $destination -Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`"" +# $ must be escaped in powershell... +Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") +Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") Pop-Location -# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. -# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h - +Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" +Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 4cc6a3b3..2f21db37 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_0_2p" +$version = "1_1_1b" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" + $sha1 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" +$sha1 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" 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 deleted file mode 100755 index ef2b3ba8..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.6-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.6-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..ef2b3ba8 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/50-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-Ubuntu-18.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -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-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -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-openSUSE-15.0-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 deleted file mode 100644 index 25c6f28a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 new file mode 100644 index 00000000..25c6f28a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index d57ad1cd..ae867cdc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -1 +1,94 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" +############################################################################# +## +## 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\..\common\windows\helpers.ps1" + +# This script installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2p" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +if (Is64BitWinHost) { + + # Install x64 bit version + $architecture = "x64" + $installFolder = "C:\openssl" + $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" + $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" + + Write-Host "Fetching from URL ..." + Download $externalUrl $internalUrl $packagex64 + Verify-Checksum $packagex64 $sha1 + Write-Host "Installing $packagex64 ..." + Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + + Write-Host "Remove downloaded $packagex64 ..." + Remove-Item -Path $packagex64 + + Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" + Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" + Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" +} + +# Install x86 bit version +$architecture = "x86" + +if (Is64BitWinHost) { + $installFolder = "C:\openssl$architecture" +} else { + $installFolder = "C:\openssl" +} + +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" + +Write-Host "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +Write-Host "Installing $packagex86 ..." +Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +Write-Host "Remove downloaded $packagex86 ..." +Remove-Item -Path $packagex86 + +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" +Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +Write-Output "OpenSSL = $version" >> ~/versions.txt + -- cgit v1.2.3 From ebcfcbe69a5d34949d938211c364e1ff6f185b39 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 16 Nov 2018 11:32:23 +0200 Subject: Add Android x86_64 architecture Task-number: QTBUG-47672 Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 802fd326..107be570 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -7,12 +7,15 @@ qtci-windows-10-x86_64-14 Mingw73 qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86_64 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86_64 qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-windows-10-x86_64-14 Android_ANY x86_64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86_64 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY x86_64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86_64 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc -- cgit v1.2.3 From 247b429c3c435a62df3d6f94c96c7cd1b7c22299 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 22 May 2019 13:13:16 +0300 Subject: Install prebuilded OpenSSL 1.1.1b for Windows 7 Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen --- .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 67 ++++++---------------- 1 file changed, 18 insertions(+), 49 deletions(-) diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index ae867cdc..f90938c4 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -33,62 +33,31 @@ . "$PSScriptRoot\..\common\windows\helpers.ps1" -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine +# This script will install OpenSSL prebuild version. Currently this pre-build version is only needed for Windows 7. +# Version was build using Windows 7 x86 and MSVC2010 -$version = "1_0_2p" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" +# Used build commands below: +# call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +# perl Configure no-asm VC-WIN32 --prefix=C:\openssl\ --openssldir=C:\openssl\ +# nmake +# nmake install -if (Is64BitWinHost) { - # Install x64 bit version - $architecture = "x64" - $installFolder = "C:\openssl" - $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" +$version = "1.1.1b" +$zip = Get-DownloadLocation ("openssl-$version.7z") +$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" - Write-Host "Fetching from URL ..." - Download $externalUrl $internalUrl $packagex64 - Verify-Checksum $packagex64 $sha1 - Write-Host "Installing $packagex64 ..." - Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" +Download $url $url $zip +Verify-Checksum $zip $sha1 +$installFolder = "C:\openssl" - Write-Host "Remove downloaded $packagex64 ..." - Remove-Item -Path $packagex64 +Extract-7Zip $zip "C:\" +Remove-Item -Path $zip - Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" - Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" - Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" -} - -# Install x86 bit version -$architecture = "x86" - -if (Is64BitWinHost) { - $installFolder = "C:\openssl$architecture" -} else { - $installFolder = "C:\openssl" -} - -$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" - -Write-Host "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -Write-Host "Installing $packagex86 ..." -Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -Write-Host "Remove downloaded $packagex86 ..." -Remove-Item -Path $packagex86 - -Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" +Prepend-Path "$installFolder\bin" -# Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "OpenSSL = $version" >> ~/versions.txt - -- cgit v1.2.3 From 5d3976765c43277a863b61e8bad0e59cf2424d31 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 26 May 2019 20:49:48 +0200 Subject: Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index fd748aba..4ccdf859 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fd748abaab7c1369613be2754e614041a0339502 +Subproject commit 4ccdf85931d97188c68b54b09a4e2ffbeff6b2a2 diff --git a/qtactiveqt b/qtactiveqt index 2d740d31..f1c8d289 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2d740d313342a014169d5f317da53e499ff4432e +Subproject commit f1c8d2893d385ccfec2049655392ffca309675bd diff --git a/qtdeclarative b/qtdeclarative index 7257358e..19ca4af1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7257358e44b373ebdd147162f7b5596d27420e7b +Subproject commit 19ca4af1a248486844ea9bf96eba62ce564ecdc9 diff --git a/qtremoteobjects b/qtremoteobjects index 0f628fc1..91d3ef83 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0f628fc1ac247a88bc68e3b3977aa9802c1129bc +Subproject commit 91d3ef83c7572fefdc059470ec7582c2d7ec9190 diff --git a/qtsvg b/qtsvg index 1983ba1d..a21cf52e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 +Subproject commit a21cf52e101ad50c330ad0b42416cc83318afea7 diff --git a/qttools b/qttools index 770ef385..96d7a808 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 770ef38581c95df9c8bf378e8446ecd2df91e549 +Subproject commit 96d7a8089e06436072cfc232383ed45d2dd34430 diff --git a/qtxmlpatterns b/qtxmlpatterns index 55c62fdd..fe047565 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 55c62fdd9cc1f9ec0fc18c6b4d804d9cb065dce0 +Subproject commit fe0475651556878b8b80b38058e5fa743822ddce -- cgit v1.2.3 From f22f1007f4330144bb336d3b809218a4cd845d71 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 May 2019 06:08:44 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78 Reviewed-by: Jani Heikkinen --- qtdoc | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtdoc b/qtdoc index 12660189..ead4cba9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 12660189b5ef1efe729de76b35794c5957c578c4 +Subproject commit ead4cba97e0ffc49a1a4720a5190cf7f5a439433 diff --git a/qtlocation b/qtlocation index ca339bc5..667af08a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ca339bc55d6fc617c63e723c43150445fc8ac050 +Subproject commit 667af08a388ffc3441adc5b8e73f2f8797b274c5 diff --git a/qttools b/qttools index e363e640..32646314 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e363e6400afaa4ddc691bfb5796efd34ecd4f4a8 +Subproject commit 326463142b42b03c0e4c59069e099d6fd27212ce diff --git a/qtwebengine b/qtwebengine index 0835dfa3..5d4bac57 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0835dfa3f9b2b20f6f40ee0c2140d5222ed4fff5 +Subproject commit 5d4bac57a0191287a2fc345f6b398fb1f5d08517 diff --git a/qtwebsockets b/qtwebsockets index 142d9798..b7d892b9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 142d9798d262a41c09a9c43f3ae3a82c771fc800 +Subproject commit b7d892b97697f90b3669dab56358a48fb3542f68 -- cgit v1.2.3 From dae67b28abc19e6208a25d2eaa88ce4337c5809d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 28 May 2019 22:15:01 +0200 Subject: Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 4ccdf859..f39178a4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4ccdf85931d97188c68b54b09a4e2ffbeff6b2a2 +Subproject commit f39178a415cb41470775a86e0aa358faa3686d81 diff --git a/qtcharts b/qtcharts index 9e28f427..5bc7cc7c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9e28f427009ee3cd25b4d1a8cd446049d51152a4 +Subproject commit 5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365 diff --git a/qtdatavis3d b/qtdatavis3d index 21583347..d7854291 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 215833472171b17db506d49646c639b4fff926ab +Subproject commit d78542919276ee6a87bfd75b83276dd72b791aaa diff --git a/qtdeclarative b/qtdeclarative index 19ca4af1..9d61684d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19ca4af1a248486844ea9bf96eba62ce564ecdc9 +Subproject commit 9d61684d70c8691d81536b7b519388586e2cbbb8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da150dac..2ee351b3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da150dacec8a2a68d290141b1e0ab268ce648edb +Subproject commit 2ee351b36b265ead80a6240c83fa9ab5d444bf08 diff --git a/qtremoteobjects b/qtremoteobjects index 91d3ef83..6f087313 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 91d3ef83c7572fefdc059470ec7582c2d7ec9190 +Subproject commit 6f0873134652fb5cba3d340075fdf99989c462b4 diff --git a/qtrepotools b/qtrepotools index 64abf60a..f6f2b04b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 diff --git a/qtscxml b/qtscxml index 01bc8df0..fba55184 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01bc8df0760e14449ca7d5b6c187bf9870efbd3d +Subproject commit fba55184b93e8f084b45716162581a6132fe94cc diff --git a/qtsvg b/qtsvg index a21cf52e..357a5bd4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a21cf52e101ad50c330ad0b42416cc83318afea7 +Subproject commit 357a5bd4d6682a50d85c88ba485ed34c745fae85 diff --git a/qttools b/qttools index 96d7a808..a3190387 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 96d7a8089e06436072cfc232383ed45d2dd34430 +Subproject commit a3190387ab37849cd5ded6fcf350afca8cd17246 diff --git a/qtwayland b/qtwayland index 03ac8d67..7107f750 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 03ac8d67fb6a94ae9c28325e306fd4291fde8bb6 +Subproject commit 7107f7501df329cf785cec1585767e5d7cbab6c2 diff --git a/qtwebchannel b/qtwebchannel index 6031bd7b..b376dfa4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6031bd7bfdf97c492f9f11b4bd0a5375613b55de +Subproject commit b376dfa4242db85269d138f7e9a77f5bb13964b6 diff --git a/qtwebengine b/qtwebengine index 0f081baa..a69029cf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0f081baa31facec779057de29eec14c6f458f6a6 +Subproject commit a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5 diff --git a/qtwebsockets b/qtwebsockets index 2e54dbe8..79812864 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 +Subproject commit 7981286485f6fa958133718d31dc3a2c2cc21d8f diff --git a/qtwebview b/qtwebview index 0a8a69d5..d1fc6826 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0a8a69d51042b95649dbdf471acb3c96228f372e +Subproject commit d1fc6826660b8c52df4c3b0deb2ab650e0b46767 -- cgit v1.2.3 From 02404b0cec232a54e653e318e35a68aea7f19061 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 31 May 2019 04:08:58 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce Reviewed-by: Jani Heikkinen --- qtrepotools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtrepotools b/qtrepotools index 64abf60a..f6f2b04b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 -- cgit v1.2.3 From 84ff024609e4eca003c604294b4102e73deba8c3 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Thu, 23 May 2019 13:42:47 +0000 Subject: Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 577d01e9dfaa9e69608097c550bd1877b5a9b735. Reason for revert: force vmx instructions to Coin level B virtual machine Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/docker.ps1 | 85 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/95-docker.ps1 | 6 ++ 2 files changed, 91 insertions(+) create mode 100644 coin/provisioning/common/windows/docker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 new file mode 100644 index 00000000..6f53eccd --- /dev/null +++ b/coin/provisioning/common/windows/docker.ps1 @@ -0,0 +1,85 @@ +############################################################################# +## +## 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 Docker tool kits and Apple Bonjour on Windows. + +function DownloadAndInstall +{ + Param ( + [string]$externalUrl, + [string]$internalUrl, + [string]$package, + [string]$sha1, + [string]$parameters + ) + + Write-Host "Fetching $package from URL..." + Download $externalUrl $internalUrl $package + Verify-Checksum $package $sha1 + + Write-Host "Installing $package..." + Run-Executable $package $parameters + + Write-Host "Remove $package..." + Remove-Item -Path $package +} + +# Install Docker Toolbox +$package = Get-DownloadLocation "DockerToolbox.exe" +$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" +$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" +DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" +Add-Path 'C:\Program Files\Docker Toolbox' +docker --version +docker-compose --version + +# Install Apple Bonjour +$package = Get-DownloadLocation "BonjourPSSetup.exe" +$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" +$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" +DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" + +# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support +$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" +$sysInfoStr = systeminfo +if ($sysInfoStr -like "*A hypervisor has been detected*") { + & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V +} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { + & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX +} else { + Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 new file mode 100644 index 00000000..df735855 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 @@ -0,0 +1,6 @@ +# Disable Hyper-V from Windows 10 Pro/Enterprise +# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. +# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". +Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart + +. "$PSScriptRoot\..\common\windows\docker.ps1" -- cgit v1.2.3 From c15485df431928ce3ee72eea253efa320cfb56db Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Jun 2019 10:59:12 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585 Reviewed-by: Jani Heikkinen --- qtqa | 2 +- qtwayland | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtqa b/qtqa index ececaf29..305f198c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa diff --git a/qtwayland b/qtwayland index fb7aa15c..1aba2b28 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fb7aa15c2a27a9dc841806d07aee9c39aa3fb2ef +Subproject commit 1aba2b28920229aa547470a6c3f3b443d7da6b3a -- cgit v1.2.3 From 81f478b533a8bf11e1fa7bd7e23cc7ec93857ef4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Jun 2019 11:55:31 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index ca0f85da..c6763ec1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ca0f85da82252057894401ada4c2daac63d770bb +Subproject commit c6763ec1491e62b9d45179906cf4c05cdf794a85 diff --git a/qtdoc b/qtdoc index ead4cba9..bcae91cd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ead4cba97e0ffc49a1a4720a5190cf7f5a439433 +Subproject commit bcae91cdb45df96dfa7c5b7eb2e6921545ed4d9e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a87188ac..ea80013b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a87188ace95ad9818e078aae72cfab7ea4a9cfaa +Subproject commit ea80013b2e990c8c28a9dfe7d6afaaa250bf2402 diff --git a/qttools b/qttools index 32646314..eb5e165d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 326463142b42b03c0e4c59069e099d6fd27212ce +Subproject commit eb5e165deb3bccdae40c146e3d311464b7548641 -- cgit v1.2.3 From a05bd71ede9e2c67a66fd2d28fab8e9e9386e51c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 5 Jun 2019 13:19:46 +0300 Subject: Disable MySQL from packaging builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't link against 3rd party GPL libraries Task-number: QTBUG-76081 Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 22 ++++++++++---------- coin/platform_configs/qt5.txt | 42 +++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 6d578eda..c94440ed 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,27 +2,27 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}} qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-sql-mysql +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a -qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 107be570..ef4d6ac9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,24 +1,24 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments --------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86_64 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86_64 -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a -qtci-windows-10-x86_64-14 Android_ANY x86_64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86_64 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 -qtci-macos-10.13-x86_64-2 Android_ANY x86_64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86_64 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86_64 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86_64 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-windows-10-x86_64-14 Android_ANY x86_64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86_64 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY x86_64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86_64 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc -qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-x86-64-qcc -- cgit v1.2.3 From 220097d10c415dfce9b7b38bbc4e266720cd7370 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Jun 2019 22:31:55 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qttools | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index d72fba3c..666a645d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d72fba3c60af5fd3aba43fd33630f334a5fb2327 +Subproject commit 666a645d1edc98dfea92fdaf7eaeed10c86dbc56 diff --git a/qtcharts b/qtcharts index 19fb5aa9..5c0c2dff 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e9 +Subproject commit 5c0c2dff8b862a32cd1ce96ca44f855298e6dbf1 diff --git a/qtconnectivity b/qtconnectivity index ea85065c..b5ec1e15 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ea85065cbbc2c51482039384f82ab9bbf32104b1 +Subproject commit b5ec1e15f360cd60386488588dd4796169082355 diff --git a/qtdeclarative b/qtdeclarative index 5af16fb4..1aa4eab4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5af16fb4dfa39ead82240f5ffbc004634f3c288f +Subproject commit 1aa4eab4a68e19702b5b3ab9b831efdc35266e66 diff --git a/qtdoc b/qtdoc index ca79f1fa..381cef68 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ca79f1fa85b0dd05daf12eba616049f22289f9ea +Subproject commit 381cef68b9acf2218d8cc4c5ca8a97bb66ea742d diff --git a/qtmultimedia b/qtmultimedia index 7ef21f7e..293566a1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7ef21f7ed206749252fbd03f673a8588890828b1 +Subproject commit 293566a1841151cf0a374af7016a396c943ab96e diff --git a/qtqa b/qtqa index ececaf29..305f198c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa diff --git a/qtquickcontrols b/qtquickcontrols index b31d58be..4acab465 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b31d58be194c205decf087dacdc6bdb5cf443d71 +Subproject commit 4acab46571b793d7a00c9fe768d9ca91a47ea6bb diff --git a/qtremoteobjects b/qtremoteobjects index ba171e01..7b09ec10 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ba171e01f90e9399ca4bfab0204b2932380ad64f +Subproject commit 7b09ec10b257bc2ee8fd08174a111f0cb5d7f93b diff --git a/qtscxml b/qtscxml index 68c9234b..6ca95b9c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 68c9234b67ca0939fcf6607d87bda90b93170567 +Subproject commit 6ca95b9cbb8934fecfe739026745d5df82e2ba92 diff --git a/qttools b/qttools index 17827131..b18d7b5b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 17827131e9dc7451e77b8a48a2ec879bc64cee38 +Subproject commit b18d7b5b4a9bc516bea9f36e3b00084cf6f11e26 diff --git a/qtwebengine b/qtwebengine index 02c01aed..7b4d55dd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 02c01aedcc08525eea226382318f6a8585c3dae7 +Subproject commit 7b4d55ddde308b6c716f2e5fe5a12ad8e99115a7 -- cgit v1.2.3 From 50bd689155e34eae335d61e40603a6020f387344 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Jun 2019 11:39:44 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I093500e5ebc9e53766233919eaf66dd223529300 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtrepotools | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index c6763ec1..e67ae0d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c6763ec1491e62b9d45179906cf4c05cdf794a85 +Subproject commit e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d diff --git a/qtdoc b/qtdoc index bcae91cd..922c0d26 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bcae91cdb45df96dfa7c5b7eb2e6921545ed4d9e +Subproject commit 922c0d26dff1f0f34ff6c575b6022205891a4868 diff --git a/qtrepotools b/qtrepotools index f6f2b04b..53caba03 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 +Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 diff --git a/qtwayland b/qtwayland index 1aba2b28..79037e46 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1aba2b28920229aa547470a6c3f3b443d7da6b3a +Subproject commit 79037e46eeb00e20c5f3bbe7d0de4b702af86884 -- cgit v1.2.3 From 5bba104a4156ab02078dea1a5417a3428a9b175f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Jun 2019 22:31:14 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 1aa4eab4..ac402fa6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1aa4eab4a68e19702b5b3ab9b831efdc35266e66 +Subproject commit ac402fa6d99eeb519a9cc23b028358dfb6df4d82 diff --git a/qtrepotools b/qtrepotools index f6f2b04b..53caba03 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 +Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 diff --git a/qtwebengine b/qtwebengine index 7b4d55dd..8b848e4a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7b4d55ddde308b6c716f2e5fe5a12ad8e99115a7 +Subproject commit 8b848e4aee238edb58dba0ded8d773c8b70392f6 -- cgit v1.2.3 From 14adbe74dd5d41f4e8e7e75c6994ab34baa12b4e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Jun 2019 22:31:13 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qttools | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 65cfac73..da23302e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 65cfac73bd1c09eafadf57a3b7161f52b186c37d +Subproject commit da23302e4d5d6bbdbbf2eaa5eb218a54e91fafeb diff --git a/qttools b/qttools index b18d7b5b..8e3c53a1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b18d7b5b4a9bc516bea9f36e3b00084cf6f11e26 +Subproject commit 8e3c53a196f66a1c9a370cda1dfde51792f92364 diff --git a/qtwebengine b/qtwebengine index 8b848e4a..7f89badd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8b848e4aee238edb58dba0ded8d773c8b70392f6 +Subproject commit 7f89badd0e1b71dabb5a88d1330b08ce9d8b6eb7 -- cgit v1.2.3 From f4bbadba412f994a87fd80f2518b7fb257301418 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 8 Jun 2019 22:31:05 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qtlocation | 2 +- qtserialbus | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtdoc b/qtdoc index 381cef68..8ce4f8e6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 381cef68b9acf2218d8cc4c5ca8a97bb66ea742d +Subproject commit 8ce4f8e68fd4fcf52709a04bab235e36d970eca3 diff --git a/qtlocation b/qtlocation index 90defc33..d94ce894 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 90defc33dceb341aa8dac03c0511b1ef2a20c6c2 +Subproject commit d94ce8943724779d465e403663a076941c561c68 diff --git a/qtserialbus b/qtserialbus index e163199a..c60080a1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e163199a2ff396de0a2395a8d4be7bdf443e682c +Subproject commit c60080a13038056e956f11205f3f883d551e2fc2 diff --git a/qtwayland b/qtwayland index 21a5038f..e367643f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 21a5038f8a2a6acc6dd1cc2f6bb0318d2c17f741 +Subproject commit e367643f57d0ce08759e9ec9a2e21696023036a9 -- cgit v1.2.3 From bb18b48251088a70099d304b766955b84b22c706 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Jun 2019 22:30:57 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index da23302e..1dc1a032 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit da23302e4d5d6bbdbbf2eaa5eb218a54e91fafeb +Subproject commit 1dc1a032a84d1cc408623ba5b77a0acf50a58eea -- cgit v1.2.3 From 67ba0e70a1d6c199e1b8bc4f91a91e619f28ae7a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Jun 2019 11:56:07 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e67ae0d6..2ea3e133 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d +Subproject commit 2ea3e133c369deefeae0605ad2f32aaea52c9e97 diff --git a/qttools b/qttools index eb5e165d..c7c3e2f2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eb5e165deb3bccdae40c146e3d311464b7548641 +Subproject commit c7c3e2f26af0842631c95f054600b6b90ef3675b -- cgit v1.2.3 From 0d7a64fd8cdf0d797118edaf791a49262a5685c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Jun 2019 22:30:57 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc Reviewed-by: Qt Submodule Update Bot --- qtquickcontrols | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquickcontrols b/qtquickcontrols index 4acab465..c310a5ab 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4acab46571b793d7a00c9fe768d9ca91a47ea6bb +Subproject commit c310a5ab6ca8cc60750f771918c72d09ff5f76be -- cgit v1.2.3 From 7b36e44d7a988193475c4b5b63b19b88a7303dc1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Jun 2019 22:31:13 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 1dc1a032..17790dd0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1dc1a032a84d1cc408623ba5b77a0acf50a58eea +Subproject commit 17790dd030cf05951c6bc886362e5645bb4eb686 diff --git a/qtdoc b/qtdoc index 8ce4f8e6..44a45dd4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8ce4f8e68fd4fcf52709a04bab235e36d970eca3 +Subproject commit 44a45dd4048a5cef9046992b6007bf800a5408bd diff --git a/qtqa b/qtqa index 305f198c..6df63e10 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa +Subproject commit 6df63e1055709b835adc60ca36dc166af1d3700a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 324ec97a..7ded94bf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 324ec97aa256549c56d506fd96c1e06c35fed1ae +Subproject commit 7ded94bf0eb2b78f37bb9f84a0cc36e4ec520023 diff --git a/qtrepotools b/qtrepotools index 53caba03..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf diff --git a/qttools b/qttools index 8e3c53a1..d3bab024 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8e3c53a196f66a1c9a370cda1dfde51792f92364 +Subproject commit d3bab02430fa65e42c9a782d7ed724f7e00404ca -- cgit v1.2.3 From d063074b0fd02cb579cd25a473bb184d4bd99389 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Jun 2019 16:32:49 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 2ea3e133..90aefe08 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2ea3e133c369deefeae0605ad2f32aaea52c9e97 +Subproject commit 90aefe0843a50aede26b8d411f46f3828dae25f1 diff --git a/qtqa b/qtqa index 305f198c..6df63e10 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 305f198ccf65a28cfd8d2e563b41510c8365bcfa +Subproject commit 6df63e1055709b835adc60ca36dc166af1d3700a diff --git a/qtrepotools b/qtrepotools index 53caba03..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 53caba0307b908f7008e8be8588d5b734f946074 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf diff --git a/qttools b/qttools index c7c3e2f2..cc925047 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c7c3e2f26af0842631c95f054600b6b90ef3675b +Subproject commit cc9250477eaa71a3f3ffd050591d4a9d835288ca -- cgit v1.2.3 From fd1f34192a4b441965abe64c0deb84b831c97a6d Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 12 Jun 2019 13:36:54 +0300 Subject: Fix qt5.git builds some '-' is missing from qt5.txt causing coin to ignore all configurations from that file. So adding enough '-' in title column to solve the issue. Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee Reviewed-by: Akseli Salovaara --- coin/platform_configs/qt5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ef4d6ac9..dfa6a2e3 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -- cgit v1.2.3 From 305278ff93e1b167c8ec768655605f2f0ff20a4a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 12 Jun 2019 22:31:12 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 17790dd0..83dccf00 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 17790dd030cf05951c6bc886362e5645bb4eb686 +Subproject commit 83dccf00ccf75da27551b68652d5c3c1b4f7ebff diff --git a/qtqa b/qtqa index 6df63e10..9ebbac76 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6df63e1055709b835adc60ca36dc166af1d3700a +Subproject commit 9ebbac76e9e3141df8acee48f4a60cdceb614244 -- cgit v1.2.3 From 09180d3f9555e48a21c4dc0851f4f43134190d3d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 13 Jun 2019 14:04:22 +0000 Subject: Update submodules on '5.13.0' in qt5 Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 90aefe08..fc9ae22c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 90aefe0843a50aede26b8d411f46f3828dae25f1 +Subproject commit fc9ae22c88dd085c7c31599037132fc756feeb04 diff --git a/qtqa b/qtqa index 6df63e10..76b891a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6df63e1055709b835adc60ca36dc166af1d3700a +Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 -- cgit v1.2.3 From 644f8b7006737a89bfa171fcc7df15a312d678d7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 11 Jun 2019 15:40:29 +0300 Subject: Fix openssl 1.1 library configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen Reviewed-by: Simo Fält (cherry picked from commit de415914772b5ced911ec9f04738dab2ec355fc9) Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 10 +++++----- coin/provisioning/common/unix/install-openssl.sh | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c94440ed..6152eab0 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,12 +7,12 @@ qtci-windows-10-x86_64-14 MSVC2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-sql-mysql -qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}} +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index afc1509e..01a20935 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -59,6 +59,12 @@ if [[ "$os" == "linux" ]]; then ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" + if uname -a |grep -q "Ubuntu"; then + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile + else + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc + fi + elif [ "$os" == "macos" ]; then # Below target location has been hard coded into Coin. # QTQAINFRA-1195 -- cgit v1.2.3 From dcb1c8b41c04aef12e21088ff28dcc11be939b08 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 14 Jun 2019 22:31:34 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 83dccf00..1632786f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 83dccf00ccf75da27551b68652d5c3c1b4f7ebff +Subproject commit 1632786f00875d23c7d111cbb29dedaa35c1c8c2 diff --git a/qtdeclarative b/qtdeclarative index ac402fa6..15b90204 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ac402fa6d99eeb519a9cc23b028358dfb6df4d82 +Subproject commit 15b90204fa5126f339db551cf7429534f1359322 diff --git a/qtqa b/qtqa index 9ebbac76..76b891a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 9ebbac76e9e3141df8acee48f4a60cdceb614244 +Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7ded94bf..b00d649f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7ded94bf0eb2b78f37bb9f84a0cc36e4ec520023 +Subproject commit b00d649f109b080b7068c4a7a2a7731d7fb51ea1 diff --git a/qttools b/qttools index d3bab024..2c1c1f74 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d3bab02430fa65e42c9a782d7ed724f7e00404ca +Subproject commit 2c1c1f74ea69d2bdd984b5d5764db08ee77f1e6f diff --git a/qtwebengine b/qtwebengine index 7f89badd..e58f2aa8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7f89badd0e1b71dabb5a88d1330b08ce9d8b6eb7 +Subproject commit e58f2aa8e515e5faf54ec9364a2b7972f9761dcd -- cgit v1.2.3 From 6f6b43593e2e994c5487360e2c88a06a1ad65a72 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 17 Jun 2019 22:32:31 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 666a645d..5c61a323 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 666a645d1edc98dfea92fdaf7eaeed10c86dbc56 +Subproject commit 5c61a32369b003bae6ed045da230db8d8dd0f82d diff --git a/qtbase b/qtbase index 1632786f..5aaade8c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1632786f00875d23c7d111cbb29dedaa35c1c8c2 +Subproject commit 5aaade8c935caa1add92f61187c0065e34cf7e0e diff --git a/qtmultimedia b/qtmultimedia index 293566a1..4cc6895d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 293566a1841151cf0a374af7016a396c943ab96e +Subproject commit 4cc6895d2f6bf6542623301c8deec1570d6dd916 diff --git a/qttools b/qttools index 2c1c1f74..945d7c1f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2c1c1f74ea69d2bdd984b5d5764db08ee77f1e6f +Subproject commit 945d7c1f00f08fb1cb29bd548e8c4d0a42857f67 diff --git a/qtwayland b/qtwayland index e367643f..eaf3bb5a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e367643f57d0ce08759e9ec9a2e21696023036a9 +Subproject commit eaf3bb5a4c8564081ac96794b6ffa0c6c561cf07 diff --git a/qtwebengine b/qtwebengine index e58f2aa8..1cd5d7bd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e58f2aa8e515e5faf54ec9364a2b7972f9761dcd +Subproject commit 1cd5d7bd3c922e3162d7c70a6a9cfc43d9fa9564 -- cgit v1.2.3 From d869c671b5c15c48d1d03e482d5640ea6dda6e06 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 18 Jun 2019 10:06:49 +0200 Subject: Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index f39178a4..c166f615 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f39178a415cb41470775a86e0aa358faa3686d81 +Subproject commit c166f615647b1e0635ad109e18ddc2870819421b diff --git a/qtactiveqt b/qtactiveqt index f1c8d289..95ecd545 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f1c8d2893d385ccfec2049655392ffca309675bd +Subproject commit 95ecd545be0ca40bf6328c4d1ae95f5fbc247c9f diff --git a/qtcharts b/qtcharts index 5bc7cc7c..6d4a7dd1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365 +Subproject commit 6d4a7dd15e57cbcb71c5a118fb9b63bef4df9819 diff --git a/qtconnectivity b/qtconnectivity index 6b9469b1..bbd5a988 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6b9469b1a229486986f572af09459dacce5795de +Subproject commit bbd5a988592e31b5f8ec0a111e7fea30c222f0ec diff --git a/qtdatavis3d b/qtdatavis3d index d7854291..e82f57fc 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d78542919276ee6a87bfd75b83276dd72b791aaa +Subproject commit e82f57fc52fc9bdae9c2acfe624b927103b775f3 diff --git a/qtdeclarative b/qtdeclarative index 9d61684d..8068e7b9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9d61684d70c8691d81536b7b519388586e2cbbb8 +Subproject commit 8068e7b98cde09565efe27585b84e120f9c5ea99 diff --git a/qtdoc b/qtdoc index 81061285..205db431 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81061285220ccada412d4891f2a76867844dd883 +Subproject commit 205db431cad9bc40581400573d9d626f82d94052 diff --git a/qtlocation b/qtlocation index 971423c5..a7fc9ec3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 971423c512623b84618cfc73b992da1f1dc014f8 +Subproject commit a7fc9ec342ca1eac08bf5902ccc17c4d64132bbd diff --git a/qtmultimedia b/qtmultimedia index afca8928..c29fcbca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit afca8928ce8e4113a224e57fa30a3b4bc5a2db47 +Subproject commit c29fcbca82943c23bc21fcafb204a78ec29d3ef8 diff --git a/qtqa b/qtqa index ececaf29..76b891a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 diff --git a/qtquickcontrols b/qtquickcontrols index d2a661f1..2785bcb8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d2a661f16e9982c45260efb9875b83c581b82287 +Subproject commit 2785bcb8f0ac04d0d2bc73b06206af1566c43958 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2ee351b3..9e54a59d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2ee351b36b265ead80a6240c83fa9ab5d444bf08 +Subproject commit 9e54a59d9bee3ccc0a8c3e63e210ca0b3fa1eb05 diff --git a/qtremoteobjects b/qtremoteobjects index 6f087313..16390764 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6f0873134652fb5cba3d340075fdf99989c462b4 +Subproject commit 1639076404e4ece74c103e16356cce6bd9cff9e8 diff --git a/qtrepotools b/qtrepotools index f6f2b04b..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf diff --git a/qtscript b/qtscript index 583dcc6d..0f93eff7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 +Subproject commit 0f93eff78f1396f4d55e08b1bffaf7ce557b364f diff --git a/qtscxml b/qtscxml index fba55184..84bb562b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit fba55184b93e8f084b45716162581a6132fe94cc +Subproject commit 84bb562bfc1168121774d3c4b073e3e05b6efcde diff --git a/qtserialbus b/qtserialbus index fdf0ff9d..73a56bec 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e +Subproject commit 73a56becfeb960cfd4145bfb0ab597cd72705fa4 diff --git a/qtspeech b/qtspeech index 5cf744a0..e80a2764 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5cf744a096bb079bd33e417e9fb62a6d6726a3a3 +Subproject commit e80a2764eae65743d3d6a3195c92fd3a3fee998a diff --git a/qtsvg b/qtsvg index 357a5bd4..b367ddfe 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 357a5bd4d6682a50d85c88ba485ed34c745fae85 +Subproject commit b367ddfed778ac2f3ce28e39ba83bbe3c1e1437c diff --git a/qttools b/qttools index a3190387..fb217099 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a3190387ab37849cd5ded6fcf350afca8cd17246 +Subproject commit fb217099b4e03aaa2893e59470a4fe3ec125c9a7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 460a7cee..89c1ba87 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 460a7cee80e21df752501161c91b08c2059612fb +Subproject commit 89c1ba8732069dc73943e2ab66111cd5ed7d988d diff --git a/qtwayland b/qtwayland index 7107f750..def0e414 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7107f7501df329cf785cec1585767e5d7cbab6c2 +Subproject commit def0e4145f1d329679a8c603405bd0e96f2d9484 diff --git a/qtwebengine b/qtwebengine index a69029cf..9680828a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5 +Subproject commit 9680828ac40d6e10eac02f4981f3668669409acf diff --git a/qtwebsockets b/qtwebsockets index 79812864..54ffd0d0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7981286485f6fa958133718d31dc3a2c2cc21d8f +Subproject commit 54ffd0d0a3bf2c77d53e1cdfe04b362f59682cb4 diff --git a/qtwinextras b/qtwinextras index 878d6226..5c6762c5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 878d6226f2472b3dff192207aa0c2a03eb4d3465 +Subproject commit 5c6762c53d47b3bd3b604afd389669a3670b1ec5 diff --git a/qtxmlpatterns b/qtxmlpatterns index fe047565..fc214a5d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fe0475651556878b8b80b38058e5fa743822ddce +Subproject commit fc214a5d298e9d916882528c43e78e386ff8b0ad -- cgit v1.2.3 From a0b69977c6c54c33a9bf6e1e412e8ec1ee5bdf20 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 18 Jun 2019 11:20:22 +0200 Subject: Add qtquicktimeline as a submodule in qt5.git#dev Task-number: QDS-54 Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95 Reviewed-by: Jani Heikkinen --- .gitmodules | 6 ++++++ qtquicktimeline | 1 + 2 files changed, 7 insertions(+) create mode 160000 qtquicktimeline diff --git a/.gitmodules b/.gitmodules index 5bd390c4..b3c46af7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -312,3 +312,9 @@ url = ../qtlottie.git branch = dev status = preview +[submodule "qtquicktimeline"] + depends = qtbase qtdeclarative + path = qtquicktimeline + url = ../qtquicktimeline + branch = dev + status = preview diff --git a/qtquicktimeline b/qtquicktimeline new file mode 160000 index 00000000..6e6d4927 --- /dev/null +++ b/qtquicktimeline @@ -0,0 +1 @@ +Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f -- cgit v1.2.3 From a04751c10e7f99d0e1e89570dbdded3896bcd423 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 18 Jun 2019 22:31:30 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtnetworkauth | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 5aaade8c..4ad91542 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5aaade8c935caa1add92f61187c0065e34cf7e0e +Subproject commit 4ad915425d804df798e12031c9b2fc13534dcb97 diff --git a/qtconnectivity b/qtconnectivity index b5ec1e15..80c84c4d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b5ec1e15f360cd60386488588dd4796169082355 +Subproject commit 80c84c4df0cb8dc5389542dde34317102f7b25b8 diff --git a/qtnetworkauth b/qtnetworkauth index f52ff01d..552e8dac 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f52ff01d38400d5343af9149414f3573580a2405 +Subproject commit 552e8dac97cf04a355b0935491b61cc5f2fb4201 diff --git a/qtwayland b/qtwayland index eaf3bb5a..640d60c4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eaf3bb5a4c8564081ac96794b6ffa0c6c561cf07 +Subproject commit 640d60c4de4137aa9093093fc047dccd37d7eb13 diff --git a/qtwebchannel b/qtwebchannel index cbb8fc1a..f119c066 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cbb8fc1ae374e2b25c733e3f15109fb407e0cf95 +Subproject commit f119c0669bc261786e9151ec4b31f6cf1fd2e28b diff --git a/qtwebengine b/qtwebengine index 1cd5d7bd..d3839cb7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1cd5d7bd3c922e3162d7c70a6a9cfc43d9fa9564 +Subproject commit d3839cb77a694c66f8c4c782653bfc2bb82b9dc4 diff --git a/qtwebsockets b/qtwebsockets index 142d9798..34c8622d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 142d9798d262a41c09a9c43f3ae3a82c771fc800 +Subproject commit 34c8622dbaafaa67c15a221a6c90390419c28063 -- cgit v1.2.3 From dedbec30d130b7f143408bf3eea1a596d1a360f0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Jun 2019 22:30:48 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 5c61a323..663dbcad 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5c61a32369b003bae6ed045da230db8d8dd0f82d +Subproject commit 663dbcad9b4905dc16bb2f0fb54060bd0ab99810 diff --git a/qtbase b/qtbase index 4ad91542..b8772856 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4ad915425d804df798e12031c9b2fc13534dcb97 +Subproject commit b877285694501d16b2bb0dc8d1a92e185b079b87 diff --git a/qtdeclarative b/qtdeclarative index 15b90204..af0d8632 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 15b90204fa5126f339db551cf7429534f1359322 +Subproject commit af0d8632d8895373287bdf8f917272a0fa1820e0 diff --git a/qttools b/qttools index 945d7c1f..18f9ac9e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 945d7c1f00f08fb1cb29bd548e8c4d0a42857f67 +Subproject commit 18f9ac9e9489e48ea756bd89f6f40dd4499c42a3 diff --git a/qtwebengine b/qtwebengine index d3839cb7..6ce1ed28 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d3839cb77a694c66f8c4c782653bfc2bb82b9dc4 +Subproject commit 6ce1ed282c304c0d0f70909f8e296dee115e9d2c -- cgit v1.2.3 From 6131434bdf2cf24a487c8882d3d4257b53e70f56 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 20 Jun 2019 22:31:38 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index 663dbcad..08bcfc39 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 663dbcad9b4905dc16bb2f0fb54060bd0ab99810 +Subproject commit 08bcfc398d51e0e23783a4f02623e5b27e675092 diff --git a/qtactiveqt b/qtactiveqt index 21a27816..e6435ef4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 21a27816e66c8bea33b3ee28221df4b0c6ee9baf +Subproject commit e6435ef49c9d16ef288993d43b6f42c2b9c2fa32 diff --git a/qtandroidextras b/qtandroidextras index 17985125..3af884ca 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 17985125ca974456900bca463b98a47af9ce4970 +Subproject commit 3af884ca599c476e078cb38461ad1117c57dc4a3 diff --git a/qtbase b/qtbase index b8772856..2ce4a9f4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b877285694501d16b2bb0dc8d1a92e185b079b87 +Subproject commit 2ce4a9f48705095669cb74c8de9d8a72f9d49b0e diff --git a/qtcharts b/qtcharts index 5c0c2dff..1256a1ed 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5c0c2dff8b862a32cd1ce96ca44f855298e6dbf1 +Subproject commit 1256a1edd5cdd84c4f74951f640056062a855116 diff --git a/qtconnectivity b/qtconnectivity index 80c84c4d..b96ed240 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 80c84c4df0cb8dc5389542dde34317102f7b25b8 +Subproject commit b96ed240e7479641b9dc4feb0aee4f002228a21e diff --git a/qtdatavis3d b/qtdatavis3d index e4cd15e3..2e60208c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e4cd15e388f675a80a9c257655a580b1b53c240a +Subproject commit 2e60208c8e2f81bac979fbdfd51f9079867d0203 diff --git a/qtdeclarative b/qtdeclarative index af0d8632..e937a738 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit af0d8632d8895373287bdf8f917272a0fa1820e0 +Subproject commit e937a7387876c130cabf8ac640a9d4ffd22fd1cb diff --git a/qtgamepad b/qtgamepad index 653900f1..bdb571e9 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 653900f1d4801f184ddd9725f0806406a4021b8b +Subproject commit bdb571e9a3fbf789dde4406e88b63a6dbc215d00 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fc823235..e25bb49a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fc82323538ffde51ab03a38db4d6e61b372a091e +Subproject commit e25bb49afc375303b7a4e361612651497e3b762f diff --git a/qtimageformats b/qtimageformats index f396928f..c6a01635 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f396928fb5af3e9df251afed7a15175f26ece8fb +Subproject commit c6a01635a03b96311673c764e41501782e53e230 diff --git a/qtmacextras b/qtmacextras index 1196b92a..511d6f25 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 1196b92a6428b22c56f1df3fc70337c02972d9d0 +Subproject commit 511d6f2502ddc480716e83be0d74a8c0f9387dc6 diff --git a/qtmultimedia b/qtmultimedia index 4cc6895d..f5655666 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4cc6895d2f6bf6542623301c8deec1570d6dd916 +Subproject commit f56556663573efae4180b000e1b01e713d80e33c diff --git a/qtnetworkauth b/qtnetworkauth index 552e8dac..3d493559 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 552e8dac97cf04a355b0935491b61cc5f2fb4201 +Subproject commit 3d4935594a5ba35a83e6098eaa8eac52aba22ca2 diff --git a/qtpurchasing b/qtpurchasing index f9ab1500..0bf99caf 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f9ab15009bdc249d4f19513fc9730d81f5b50fe5 +Subproject commit 0bf99caf06085b2f4ac04767b311ef0a544af046 diff --git a/qtqa b/qtqa index 76b891a5..3908dc23 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 +Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 diff --git a/qtquickcontrols b/qtquickcontrols index c310a5ab..635af7d7 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c310a5ab6ca8cc60750f771918c72d09ff5f76be +Subproject commit 635af7d771d071c51b714b7aa183eca0d7066818 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b00d649f..fe127d8d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b00d649f109b080b7068c4a7a2a7731d7fb51ea1 +Subproject commit fe127d8da4688b74dc6b9ad1f7170c8b5f1ef609 diff --git a/qtremoteobjects b/qtremoteobjects index 7b09ec10..1e9b3af7 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7b09ec10b257bc2ee8fd08174a111f0cb5d7f93b +Subproject commit 1e9b3af7b54b43d36ab0356b682b97f7a83a132a diff --git a/qtscript b/qtscript index 73296231..66e484db 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 732962319eeae2881890bd146146e7e6f486c9fb +Subproject commit 66e484db9353d1ac1c7557d9d4cd0bfe0819f61b diff --git a/qtscxml b/qtscxml index 6ca95b9c..bf4be2d9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6ca95b9cbb8934fecfe739026745d5df82e2ba92 +Subproject commit bf4be2d9fb957298a8395afb368b690948a0c7a9 diff --git a/qtsensors b/qtsensors index a6c957fa..9f93ec7f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a6c957faef10efce3056791a4bd3be900b423411 +Subproject commit 9f93ec7f85f856be98eed42a4e9d1d85032b0908 diff --git a/qtserialbus b/qtserialbus index c60080a1..13d66512 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c60080a13038056e956f11205f3f883d551e2fc2 +Subproject commit 13d66512a1b77cb0977e4345ee3e803e7dbafbb4 diff --git a/qtserialport b/qtserialport index bab8ca79..c37d2c8f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bab8ca799f3a54c10f92958f2db1ce482adfc08c +Subproject commit c37d2c8f48f4e19ffd07ad14047a5276e9feaf6a diff --git a/qtspeech b/qtspeech index bda364fe..8ab911c1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit bda364fe3df7dd6269e2d284fcc2c6d239a962b7 +Subproject commit 8ab911c1b92d86f850f9c845bb8ca1f5a6009f01 diff --git a/qtsvg b/qtsvg index 7e7ed705..0eea9846 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7e7ed705efc51134b27820d76beceefc62ab0b3d +Subproject commit 0eea98461937a4c0f972c8fe1a70e0149b73e3f0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a364970e..02cc5cde 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a364970e8b94134bb7e895a353688683b9749c4e +Subproject commit 02cc5cded753495035457aac532e8bff225e1838 diff --git a/qtwayland b/qtwayland index 640d60c4..37188068 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 640d60c4de4137aa9093093fc047dccd37d7eb13 +Subproject commit 37188068b61d55fc82970f90cf3ef9b09044e04c diff --git a/qtwebchannel b/qtwebchannel index f119c066..986ce4a0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f119c0669bc261786e9151ec4b31f6cf1fd2e28b +Subproject commit 986ce4a02ba9b33b908cdbdc46e3ceda0e50b99f diff --git a/qtwebengine b/qtwebengine index 6ce1ed28..e781377d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6ce1ed282c304c0d0f70909f8e296dee115e9d2c +Subproject commit e781377d2c1582ff358aeabdaf75d77db94fd71c diff --git a/qtwebglplugin b/qtwebglplugin index c21dbf12..d1dd26bf 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit c21dbf122e57ee90436de65a7f868fd8ce5a377b +Subproject commit d1dd26bf2d566a1b18781e566ec92bf707f63ff1 diff --git a/qtwebsockets b/qtwebsockets index 34c8622d..b7b3ef26 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 34c8622dbaafaa67c15a221a6c90390419c28063 +Subproject commit b7b3ef26b7da4d25c61bfbc193d3158c6d50330c diff --git a/qtwebview b/qtwebview index e06350f7..4c74374d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e06350f7c414e8e4050abe2bb402b9b8ec0e5db7 +Subproject commit 4c74374ddfa503c588bce531a387d946987c5c51 diff --git a/qtwinextras b/qtwinextras index 1ec9cfb3..374ab034 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 1ec9cfb3379b40132f8d61a6b8b9145df4ac0a09 +Subproject commit 374ab03458d48c8ef4fb67ba38cfdfd994cc0627 diff --git a/qtx11extras b/qtx11extras index ce6b90e5..136f7679 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ce6b90e597e93252a56d37e616fbd473e1ae8c33 +Subproject commit 136f7679d066f7318b84795ca4fbc8857315a3ef diff --git a/qtxmlpatterns b/qtxmlpatterns index 0cad1b40..610d28b4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0cad1b4051a69c5a96be41e7aaa8da97302785f5 +Subproject commit 610d28b43d154b6bbc6f828b0ae97af803e113ac -- cgit v1.2.3 From e7f8eeb30d19869d95a2112c5ebaa1e00c286ae7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 22 Jun 2019 22:30:55 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtscxml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 2ce4a9f4..e3b3dbbe 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2ce4a9f48705095669cb74c8de9d8a72f9d49b0e +Subproject commit e3b3dbbe93dbbac196543f62b444b2c044d14907 diff --git a/qtdeclarative b/qtdeclarative index e937a738..2d4787de 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e937a7387876c130cabf8ac640a9d4ffd22fd1cb +Subproject commit 2d4787de33ce81cf53cda6f63719f1167bd94392 diff --git a/qtmultimedia b/qtmultimedia index f5655666..e988f423 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f56556663573efae4180b000e1b01e713d80e33c +Subproject commit e988f423991084eb7187c420676e875ffb355188 diff --git a/qtscxml b/qtscxml index bf4be2d9..8be5e493 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bf4be2d9fb957298a8395afb368b690948a0c7a9 +Subproject commit 8be5e49379fa8c0f1e1e41ff4bce91e30699b352 -- cgit v1.2.3 From 19894d279f0c8250c7425a0854e41b3c1130d53b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 24 Jun 2019 09:31:56 +0200 Subject: Update submodules on 'dev' in qt5 Skip qttools in this round. Temporarily ignore qtwebengine due to QTBUG-76549. Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9 Reviewed-by: Liang Qi --- .gitmodules | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwinextras | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3c46af7..f954739a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative diff --git a/qtactiveqt b/qtactiveqt index 95ecd545..e453d672 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 95ecd545be0ca40bf6328c4d1ae95f5fbc247c9f +Subproject commit e453d6720d185da8b882f71572b1130659f16262 diff --git a/qtbase b/qtbase index a0c4b6f3..b17e0572 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0c4b6f34546bdd22167a76a0540d37e9a37c0cf +Subproject commit b17e05729e3404d2fe65f28a903a7a1b9f6cc115 diff --git a/qtconnectivity b/qtconnectivity index bbd5a988..eb78e559 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bbd5a988592e31b5f8ec0a111e7fea30c222f0ec +Subproject commit eb78e559661ac86715d7546d28a88160acb8ec30 diff --git a/qtlocation b/qtlocation index a7fc9ec3..b1e78d73 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a7fc9ec342ca1eac08bf5902ccc17c4d64132bbd +Subproject commit b1e78d739752a044765776a59161809011875a5c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9e54a59d..e4926383 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9e54a59d9bee3ccc0a8c3e63e210ca0b3fa1eb05 +Subproject commit e4926383bd51321e0a04a361440fca8fad557395 diff --git a/qtremoteobjects b/qtremoteobjects index 16390764..a8d2e091 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1639076404e4ece74c103e16356cce6bd9cff9e8 +Subproject commit a8d2e0917cae57de193175f85accc109670419df diff --git a/qtserialport b/qtserialport index 450156f3..a0faf986 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 450156f37356f67f217de760a5df3149684dd99f +Subproject commit a0faf986fccdce1d36f3308dc520cdac001f5264 diff --git a/qtwayland b/qtwayland index def0e414..993863c4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit def0e4145f1d329679a8c603405bd0e96f2d9484 +Subproject commit 993863c4527f0565a77d7728446f954732a3c2b8 diff --git a/qtwinextras b/qtwinextras index 5c6762c5..b9b88962 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5c6762c53d47b3bd3b604afd389669a3670b1ec5 +Subproject commit b9b88962fe2f3ec23c06143129e6753ef3fd675a -- cgit v1.2.3 From 35c1c887495d7e3210bcb9b58699a75aed48432c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Jun 2019 13:02:11 +0300 Subject: Update platform_configs for QtWebKit * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3 Reviewed-by: Simon Hausmann --- coin/platform_configs/qtwebkit.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 9e1c893f..2991def2 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,3 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -- cgit v1.2.3 From 1ba5e3b0b9b4c2ea344c9fb628de9739c2e36352 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 24 Jun 2019 22:30:58 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b Reviewed-by: Qt Submodule Update Bot --- qtconnectivity | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index b96ed240..e511f35a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b96ed240e7479641b9dc4feb0aee4f002228a21e +Subproject commit e511f35a90608a4fb144b2c3dac37986d81cb41c diff --git a/qtwebengine b/qtwebengine index e781377d..541176f7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e781377d2c1582ff358aeabdaf75d77db94fd71c +Subproject commit 541176f774034ebacb69fc93acf992da9c929892 -- cgit v1.2.3 From 3a940903c0a3814f5440b9e194e69ea076e24c0e Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 25 Jun 2019 10:45:39 +0300 Subject: Make header line in qtwebkit.txt longer to prevent parsing error Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456 Reviewed-by: Simon Hausmann --- coin/platform_configs/qtwebkit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 2991def2..2d753e07 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- +--------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -- cgit v1.2.3 From daf8327b2c71982a8f9599e9c41cff6577f1e9be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 25 Jun 2019 20:16:42 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e3b3dbbe..bc8f8717 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e3b3dbbe93dbbac196543f62b444b2c044d14907 +Subproject commit bc8f871784431638b5c43e1977c31ce2060affd3 diff --git a/qtdeclarative b/qtdeclarative index 2d4787de..cff8d9f1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2d4787de33ce81cf53cda6f63719f1167bd94392 +Subproject commit cff8d9f1d2d309cd9417bb93386a1443ed1892c3 diff --git a/qtdoc b/qtdoc index 44a45dd4..8ce4d6e9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 44a45dd4048a5cef9046992b6007bf800a5408bd +Subproject commit 8ce4d6e90a19f6c5e75ee1aef982f4ce1a799f8f diff --git a/qtlocation b/qtlocation index d94ce894..3833e418 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d94ce8943724779d465e403663a076941c561c68 +Subproject commit 3833e418682331cc76bfc287ae818557bdac447c -- cgit v1.2.3 From 03969bfe230d852f5e0cc78b878313dcb1061b15 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 27 Jun 2019 13:27:19 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ie0b1c3abcaea4a74279a7001cadecac70c1f853b Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index c166f615..9486ac48 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c166f615647b1e0635ad109e18ddc2870819421b +Subproject commit 9486ac4845173c4fec4e22aad68382eb95a48b01 diff --git a/qtactiveqt b/qtactiveqt index e453d672..83686958 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e453d6720d185da8b882f71572b1130659f16262 +Subproject commit 83686958db030a860a5af67c3576da25dc881fe8 diff --git a/qtandroidextras b/qtandroidextras index ecdf7177..7587c6f3 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ecdf7177b90c8c5de060da076b12e4869e57b4d5 +Subproject commit 7587c6f319c00f4471e70cf913155d30d6026d49 diff --git a/qtbase b/qtbase index b17e0572..5859f7d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b17e05729e3404d2fe65f28a903a7a1b9f6cc115 +Subproject commit 5859f7d0d9440f82086486639a707f3935696cf4 diff --git a/qtcharts b/qtcharts index 6d4a7dd1..248fff48 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6d4a7dd15e57cbcb71c5a118fb9b63bef4df9819 +Subproject commit 248fff483ae1597c62a93edf91841b84b363739b diff --git a/qtconnectivity b/qtconnectivity index eb78e559..a628d05c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit eb78e559661ac86715d7546d28a88160acb8ec30 +Subproject commit a628d05ced75d0666bd462f94807d3d600ca25d2 diff --git a/qtdatavis3d b/qtdatavis3d index e82f57fc..afd72ec3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e82f57fc52fc9bdae9c2acfe624b927103b775f3 +Subproject commit afd72ec3dd177249fcb78683c13cae780a1a59f9 diff --git a/qtdeclarative b/qtdeclarative index 8068e7b9..9834ac56 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8068e7b98cde09565efe27585b84e120f9c5ea99 +Subproject commit 9834ac56049408fbd848e364a82aabddc0815a07 diff --git a/qtgamepad b/qtgamepad index 337abe99..0a08df18 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 337abe99492d7d6d5229b615fa1559fc2f4ee6eb +Subproject commit 0a08df18e079f6cbb0d01a2dccea20e4a98acc50 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fe2eefc0..86f56a81 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fe2eefc036f3f42457e7f2e012f21fdec84550eb +Subproject commit 86f56a816995a42cc7c1d9ade70601e3729a363e diff --git a/qtlocation b/qtlocation index b1e78d73..4917caeb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b1e78d739752a044765776a59161809011875a5c +Subproject commit 4917caebcd9e2ca92bbbad8234c887fbc1bec0ed diff --git a/qtmacextras b/qtmacextras index ca1414e6..f37e6bf9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ca1414e6b7ce219efa86e965a5c031b79e7a604e +Subproject commit f37e6bf9fab5e326c471757d4577d52e9598ac72 diff --git a/qtmultimedia b/qtmultimedia index c29fcbca..7512ac33 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c29fcbca82943c23bc21fcafb204a78ec29d3ef8 +Subproject commit 7512ac335846b0297e26ff3ec85dc2b1c09ec223 diff --git a/qtnetworkauth b/qtnetworkauth index 8bc6feb3..5296161d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8bc6feb36a471006cfa4b62189edc3d7fd67bf78 +Subproject commit 5296161d8089391c18520ac1fc72c8ea6ff1165b diff --git a/qtpurchasing b/qtpurchasing index 91fc2ee3..55061353 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 91fc2ee34cfd674d134e88dc7f3c54453ec685e7 +Subproject commit 55061353ee4edda62b60eba199a3f292ff4e657c diff --git a/qtqa b/qtqa index 76b891a5..3908dc23 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 +Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 diff --git a/qtquickcontrols b/qtquickcontrols index 2785bcb8..aa3048bf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2785bcb8f0ac04d0d2bc73b06206af1566c43958 +Subproject commit aa3048bf531f6dd3a33fb911886b64e9371bf853 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e4926383..b784d232 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e4926383bd51321e0a04a361440fca8fad557395 +Subproject commit b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 diff --git a/qtremoteobjects b/qtremoteobjects index a8d2e091..3d729fab 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a8d2e0917cae57de193175f85accc109670419df +Subproject commit 3d729fabf2740af247f302c450f0bece7b85f881 diff --git a/qtscript b/qtscript index 0f93eff7..a3adc718 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0f93eff78f1396f4d55e08b1bffaf7ce557b364f +Subproject commit a3adc71865c4d6af1c6f1eb850dec708299ae3de diff --git a/qtscxml b/qtscxml index 84bb562b..68c61e39 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 84bb562bfc1168121774d3c4b073e3e05b6efcde +Subproject commit 68c61e39f6522efa89593303f96f5805971fcbf7 diff --git a/qtserialbus b/qtserialbus index 73a56bec..387ec99c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 73a56becfeb960cfd4145bfb0ab597cd72705fa4 +Subproject commit 387ec99ce1ce91fc82f43e886aee2c0dc103da4e diff --git a/qtspeech b/qtspeech index e80a2764..fd9ba730 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e80a2764eae65743d3d6a3195c92fd3a3fee998a +Subproject commit fd9ba730f0426d04a21db655e401e9c5cc0b8ee4 diff --git a/qtsvg b/qtsvg index b367ddfe..4048798d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b367ddfed778ac2f3ce28e39ba83bbe3c1e1437c +Subproject commit 4048798d0b9e7b86f91ebedda688dca949812163 diff --git a/qttools b/qttools index fb217099..875a927b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fb217099b4e03aaa2893e59470a4fe3ec125c9a7 +Subproject commit 875a927b49b241e6a96f2c8aace8a9c69da04ce7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 89c1ba87..0ed673e3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 89c1ba8732069dc73943e2ab66111cd5ed7d988d +Subproject commit 0ed673e31e292d79d1afb5d3c7e168638e654e60 diff --git a/qtwayland b/qtwayland index 993863c4..9822df54 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 993863c4527f0565a77d7728446f954732a3c2b8 +Subproject commit 9822df545cf1aaad684cb6179b214952a4027b71 diff --git a/qtwebchannel b/qtwebchannel index b376dfa4..25fb211a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b376dfa4242db85269d138f7e9a77f5bb13964b6 +Subproject commit 25fb211a32890a1bdd2b28b9727f6806a88d221c diff --git a/qtwebglplugin b/qtwebglplugin index 2f419ac8..0631c35a 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3 +Subproject commit 0631c35a9e5dac7b25f4e1cc55e2d196fa492740 diff --git a/qtwebsockets b/qtwebsockets index 54ffd0d0..70badedb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 54ffd0d0a3bf2c77d53e1cdfe04b362f59682cb4 +Subproject commit 70badedbf70a49c2a0de1e6b82906730abe67d3e diff --git a/qtwebview b/qtwebview index d1fc6826..e4abcccb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d1fc6826660b8c52df4c3b0deb2ab650e0b46767 +Subproject commit e4abcccb992dec6c6b85c52a96ea7d9427da2cf7 diff --git a/qtwinextras b/qtwinextras index b9b88962..e229c061 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b9b88962fe2f3ec23c06143129e6753ef3fd675a +Subproject commit e229c06197f3aa6ab86b1188e054a18481d026fd diff --git a/qtx11extras b/qtx11extras index 821e5be0..79e8f837 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea +Subproject commit 79e8f8371592fa9ff7d63841e49f362ed0bfc2b2 diff --git a/qtxmlpatterns b/qtxmlpatterns index fc214a5d..d7c7daf7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fc214a5d298e9d916882528c43e78e386ff8b0ad +Subproject commit d7c7daf790d87e7d670846b6ccf7700368a4d7e0 -- cgit v1.2.3 From 3473922cb4bae92e582041f54e1faa196add6c4d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Jun 2019 20:54:57 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I2ede3578fe5d37a8df920fb9736994d25e7da47c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtscript | 2 +- qtsensors | 2 +- qtspeech | 2 +- qtwebsockets | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 9486ac48..4c03c1f6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9486ac4845173c4fec4e22aad68382eb95a48b01 +Subproject commit 4c03c1f640b6e8877990e587d46696e0fe19e312 diff --git a/qtbase b/qtbase index 5859f7d0..fc940b24 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5859f7d0d9440f82086486639a707f3935696cf4 +Subproject commit fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f diff --git a/qtdeclarative b/qtdeclarative index 9834ac56..08a83f41 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9834ac56049408fbd848e364a82aabddc0815a07 +Subproject commit 08a83f41ed2f0f91968705b005775ae8147f8083 diff --git a/qtlocation b/qtlocation index 4917caeb..74079beb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4917caebcd9e2ca92bbbad8234c887fbc1bec0ed +Subproject commit 74079bebbe44c51ab65924ee4c7e898ddf388b1c diff --git a/qtqa b/qtqa index 3908dc23..e9b796db 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 +Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 diff --git a/qtscript b/qtscript index a3adc718..7bf3fb91 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a3adc71865c4d6af1c6f1eb850dec708299ae3de +Subproject commit 7bf3fb919d6ab212cdafd9832343b1a413eecd53 diff --git a/qtsensors b/qtsensors index 6a8e8a64..a28678b8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6a8e8a64d3473c5ff890c022b738862a704516dc +Subproject commit a28678b83ac3a5a7530026027e2c16a23379168a diff --git a/qtspeech b/qtspeech index fd9ba730..8374f355 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit fd9ba730f0426d04a21db655e401e9c5cc0b8ee4 +Subproject commit 8374f355a1d8c488e117da1e7fefbf1e2ac28ca0 diff --git a/qtwebsockets b/qtwebsockets index 70badedb..c1b6fbfb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 70badedbf70a49c2a0de1e6b82906730abe67d3e +Subproject commit c1b6fbfb734063edb9315c109f227c90bd69fbec -- cgit v1.2.3 From 8c4ac28b0d274a198374d5e124825e7d9f540f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 26 Jun 2019 10:15:10 +0300 Subject: Add correct openSSL arguments to no-gui builds Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e9b5a561..690f3b17 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,7 +10,7 @@ qtci-windows-10-x86_64-10 MSVC2017 qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -- cgit v1.2.3 From e2fa816df4d10a330d6467cec20925ef109716ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Jun 2019 16:31:32 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I1bdf6510557ffbc7b3bfd292d18a0f27cb0cee23 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 530c6903..2a756e29 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 530c6903a449f44cc9c3fc578d5394c0eed8ddec +Subproject commit 2a756e294e2efa4bcb2b51afd1c20822df251f29 diff --git a/qtconnectivity b/qtconnectivity index d67ca376..c17f8960 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d67ca376b2111717de88596888f315fba05ef9c3 +Subproject commit c17f8960be6cec0c2f98f6ba071f3f2986db2260 diff --git a/qtdeclarative b/qtdeclarative index abfa03d7..b8a85408 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit abfa03d7021aabe22f46a04d2b9d9f6adff2478a +Subproject commit b8a85408d943bffba403d783b9082bd279460bed diff --git a/qtqa b/qtqa index 3908dc23..ff4a74d5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 +Subproject commit ff4a74d5c85d8f0d08acb8ef051b1038a1e0db7c diff --git a/qtquickcontrols b/qtquickcontrols index bc38b533..558eb844 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bc38b5338000ab85564272077b27c88bd472aa0c +Subproject commit 558eb844d59185d944c233348d2fef649e90b643 -- cgit v1.2.3 From 1d5641087a614f144521f9bafbffa84aba542aa5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 28 Jun 2019 23:01:12 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I780c4c7d8894a4933aa908b2a90f2d1d7d069677 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtscript | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index fc940b24..1ce83264 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f +Subproject commit 1ce832648e05ad6226071ec38a5da0ef08d3ab8e diff --git a/qtdeclarative b/qtdeclarative index 08a83f41..16289f35 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 08a83f41ed2f0f91968705b005775ae8147f8083 +Subproject commit 16289f35eb08a9b9a6d56ea8dec549b1f17e4daf diff --git a/qtmultimedia b/qtmultimedia index 7512ac33..421fa617 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7512ac335846b0297e26ff3ec85dc2b1c09ec223 +Subproject commit 421fa617369646eb99750c52a3b38fc3b3015ec6 diff --git a/qtscript b/qtscript index 7bf3fb91..3f12997d 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 7bf3fb919d6ab212cdafd9832343b1a413eecd53 +Subproject commit 3f12997d27230f0353c821d95a16cbed67d00e46 diff --git a/qttools b/qttools index 875a927b..7ecbe29c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 875a927b49b241e6a96f2c8aace8a9c69da04ce7 +Subproject commit 7ecbe29cd8149a1cf3b69305a102789ef6068b8f -- cgit v1.2.3 From 7eb00bc2c87f0a07baa5396253c168af011a9e1a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 29 Jun 2019 23:01:31 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I48275cb9607bc5f7f7f4d50c5c17f2bf537b9538 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 83686958..4f1b9f04 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 83686958db030a860a5af67c3576da25dc881fe8 +Subproject commit 4f1b9f04f1a2063df764e6ec33c9f5f2e04d1ba1 diff --git a/qtandroidextras b/qtandroidextras index 7587c6f3..fb0dc08c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 7587c6f319c00f4471e70cf913155d30d6026d49 +Subproject commit fb0dc08c88a8a1e0bae6ab5d61af9a97e63b614b diff --git a/qtbase b/qtbase index 1ce83264..e7b1c500 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1ce832648e05ad6226071ec38a5da0ef08d3ab8e +Subproject commit e7b1c500d45c8a96fb09b0b425472eb1cdb10943 diff --git a/qtconnectivity b/qtconnectivity index a628d05c..183327bc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a628d05ced75d0666bd462f94807d3d600ca25d2 +Subproject commit 183327bc16b97276b39479e4257b112037175930 diff --git a/qtdatavis3d b/qtdatavis3d index afd72ec3..0aec1b99 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit afd72ec3dd177249fcb78683c13cae780a1a59f9 +Subproject commit 0aec1b991987f8e990ffe2d110dda5a48bdfbb12 diff --git a/qtdoc b/qtdoc index 205db431..7d4f6e7b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 205db431cad9bc40581400573d9d626f82d94052 +Subproject commit 7d4f6e7be37a0c81ebb0f2eaa896067a88ab2cb3 diff --git a/qtgamepad b/qtgamepad index 0a08df18..45ebe8e2 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0a08df18e079f6cbb0d01a2dccea20e4a98acc50 +Subproject commit 45ebe8e27fb5ad90db0125f4e22cbd222f466082 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 86f56a81..7f05d1dd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 86f56a816995a42cc7c1d9ade70601e3729a363e +Subproject commit 7f05d1dd2f89c50d4963308838d092a609eb9899 diff --git a/qtlocation b/qtlocation index 74079beb..d61cf78b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 74079bebbe44c51ab65924ee4c7e898ddf388b1c +Subproject commit d61cf78b33ca15880c5ba4b31e450da37bd82987 diff --git a/qtmacextras b/qtmacextras index f37e6bf9..df70f175 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f37e6bf9fab5e326c471757d4577d52e9598ac72 +Subproject commit df70f175cc1885f9706bb41252678bea672d1b6c diff --git a/qtnetworkauth b/qtnetworkauth index 5296161d..b62e6d61 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5296161d8089391c18520ac1fc72c8ea6ff1165b +Subproject commit b62e6d612a44f23f96f719b10de1344c3d08602d diff --git a/qtpurchasing b/qtpurchasing index 55061353..cc046e7a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 55061353ee4edda62b60eba199a3f292ff4e657c +Subproject commit cc046e7ac58e979f2d0a4f858d71bc90f06783aa diff --git a/qtquickcontrols b/qtquickcontrols index aa3048bf..81c5d9cd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit aa3048bf531f6dd3a33fb911886b64e9371bf853 +Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd diff --git a/qtscript b/qtscript index 3f12997d..3880777f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3f12997d27230f0353c821d95a16cbed67d00e46 +Subproject commit 3880777ff260a660434d36d6f63da6fd1c25d79d diff --git a/qtscxml b/qtscxml index 68c61e39..b63320b5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 68c61e39f6522efa89593303f96f5805971fcbf7 +Subproject commit b63320b5eb7296699b3ff77bf4befe73e908e04e diff --git a/qtserialbus b/qtserialbus index 387ec99c..70ab1b4e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 387ec99ce1ce91fc82f43e886aee2c0dc103da4e +Subproject commit 70ab1b4e55f95011804371d3e04764ed87eed208 diff --git a/qtsvg b/qtsvg index 4048798d..a6de6b29 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4048798d0b9e7b86f91ebedda688dca949812163 +Subproject commit a6de6b295ad99cf1830a91c9f87a359bc84658a8 diff --git a/qttools b/qttools index 7ecbe29c..b5bf195d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7ecbe29cd8149a1cf3b69305a102789ef6068b8f +Subproject commit b5bf195dc9c7576f627f37428c5ff2ff6e958411 diff --git a/qtwebglplugin b/qtwebglplugin index 0631c35a..9be2dd63 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 0631c35a9e5dac7b25f4e1cc55e2d196fa492740 +Subproject commit 9be2dd636638620c82a48e72e92efccb5ed7e673 diff --git a/qtwebsockets b/qtwebsockets index c1b6fbfb..bfe9885c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c1b6fbfb734063edb9315c109f227c90bd69fbec +Subproject commit bfe9885c1974e9962ca3b0b88030d08a03dfa05c diff --git a/qtwebview b/qtwebview index e4abcccb..2a88e886 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e4abcccb992dec6c6b85c52a96ea7d9427da2cf7 +Subproject commit 2a88e88608eee393e23884c01aaa4ee3082a0ca3 diff --git a/qtwinextras b/qtwinextras index e229c061..3386ffc9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e229c06197f3aa6ab86b1188e054a18481d026fd +Subproject commit 3386ffc9bd99d31c9012693e37aa3ce952074773 diff --git a/qtx11extras b/qtx11extras index 79e8f837..da824904 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 79e8f8371592fa9ff7d63841e49f362ed0bfc2b2 +Subproject commit da8249048d509e7fa6cf21d33dd96fa29aed2a70 diff --git a/qtxmlpatterns b/qtxmlpatterns index d7c7daf7..7d4cbe21 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit d7c7daf790d87e7d670846b6ccf7700368a4d7e0 +Subproject commit 7d4cbe219a44b313467c0c6f89acd713a057ecbb -- cgit v1.2.3 From 3ce3dae19b6e1fde390802950c7a6e899d4357a9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 30 Jun 2019 23:01:12 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtxmlpatterns | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e7b1c500..98f7df21 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7b1c500d45c8a96fb09b0b425472eb1cdb10943 +Subproject commit 98f7df211464c79266e643a552d17067dd2b6c56 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7d4cbe21..d32c85ca 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7d4cbe219a44b313467c0c6f89acd713a057ecbb +Subproject commit d32c85cafa29001ada3f7515a9b8f2d76164193a -- cgit v1.2.3 From 439a1eb2207417a6d2d0f14766e3e627035a9a7f Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Mon, 6 May 2019 15:10:32 +0300 Subject: Change configuration files into yaml format Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi Reviewed-by: Aapo Keskimolo --- coin/platform_configs/default.yaml | 158 ++++++++++++++++++++++++++++++ coin/platform_configs/ogl-runtime.txt | 21 ---- coin/platform_configs/ogl-runtime.yaml | 1 + coin/platform_configs/qt3d-runtime.txt | 1 - coin/platform_configs/qt3d-runtime.yaml | 1 + coin/platform_configs/qt5.txt | 21 ---- coin/platform_configs/qt5.yaml | 134 +++++++++++++++++++++++++ coin/platform_configs/qtbase.txt | 4 - coin/platform_configs/qtbase.yaml | 12 +++ coin/platform_configs/qtconnectivity.txt | 3 - coin/platform_configs/qtconnectivity.yaml | 6 ++ coin/platform_configs/qtdeclarative.txt | 4 - coin/platform_configs/qtdeclarative.yaml | 12 +++ coin/platform_configs/qtsaferenderer.txt | 5 - coin/platform_configs/qtsaferenderer.yaml | 13 +++ coin/platform_configs/qtsdk.txt | 4 - coin/platform_configs/qtsdk.yaml | 8 ++ coin/platform_configs/qtwebkit.txt | 4 - coin/platform_configs/qtwebkit.yaml | 11 +++ coin/platform_configs/tqtc-qt-rta.txt | 5 - coin/platform_configs/tqtc-qt-rta.yaml | 14 +++ 21 files changed, 370 insertions(+), 72 deletions(-) create mode 100644 coin/platform_configs/default.yaml delete mode 100644 coin/platform_configs/ogl-runtime.txt create mode 100644 coin/platform_configs/ogl-runtime.yaml delete mode 100644 coin/platform_configs/qt3d-runtime.txt create mode 100644 coin/platform_configs/qt3d-runtime.yaml delete mode 100644 coin/platform_configs/qt5.txt create mode 100644 coin/platform_configs/qt5.yaml delete mode 100644 coin/platform_configs/qtbase.txt create mode 100644 coin/platform_configs/qtbase.yaml delete mode 100644 coin/platform_configs/qtconnectivity.txt create mode 100644 coin/platform_configs/qtconnectivity.yaml delete mode 100644 coin/platform_configs/qtdeclarative.txt create mode 100644 coin/platform_configs/qtdeclarative.yaml delete mode 100644 coin/platform_configs/qtsaferenderer.txt create mode 100644 coin/platform_configs/qtsaferenderer.yaml delete mode 100644 coin/platform_configs/qtsdk.txt create mode 100644 coin/platform_configs/qtsdk.yaml delete mode 100644 coin/platform_configs/qtwebkit.txt create mode 100644 coin/platform_configs/qtwebkit.yaml delete mode 100644 coin/platform_configs/tqtc-qt-rta.txt create mode 100644 coin/platform_configs/tqtc-qt-rta.yaml diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml new file mode 100644 index 00000000..cf9ec074 --- /dev/null +++ b/coin/platform_configs/default.yaml @@ -0,0 +1,158 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'MSVC2015' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw73' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' +- + Template: 'qtci-windows-10-x86_64-10' + Target arch: 'x86' + Compiler: 'MSVC2017' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%' +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'MSVC2015' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'x86' + Compiler: 'MSVC2015' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'armv7' + Compiler: 'MSVC2015' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'MSVC2017' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-linux-Ubuntu-16.04-x86_64-2' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['OutOfSourceBuild', 'Documentation'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + +- + Template: 'qtci-linux-openSUSE-42.3-x86_64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-openSUSE-42.3-x86_64' + Compiler: 'ICC_18' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-openSUSE-42.3-x86_64' + Target os: 'WebAssembly' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Compiler: 'GCC' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' +- + Template: 'qtci-macos-10.12-x86_64-9' + Compiler: 'Clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'IOS_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'TvOS_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'WatchOS_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'INTEGRITY_11_04' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/ogl-runtime.txt b/coin/platform_configs/ogl-runtime.txt deleted file mode 100644 index a2b374d0..00000000 --- a/coin/platform_configs/ogl-runtime.txt +++ /dev/null @@ -1,21 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/ogl-runtime.yaml b/coin/platform_configs/ogl-runtime.yaml new file mode 100644 index 00000000..c1ec5493 --- /dev/null +++ b/coin/platform_configs/ogl-runtime.yaml @@ -0,0 +1 @@ +qt5.yaml diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 100644 index cbc25d9b..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt diff --git a/coin/platform_configs/qt3d-runtime.yaml b/coin/platform_configs/qt3d-runtime.yaml new file mode 100644 index 00000000..c1ec5493 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.yaml @@ -0,0 +1 @@ +qt5.yaml diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt deleted file mode 100644 index 09402127..00000000 --- a/coin/platform_configs/qt5.txt +++ /dev/null @@ -1,21 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- -------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86 -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml new file mode 100644 index 00000000..cabc1933 --- /dev/null +++ b/coin/platform_configs/qt5.yaml @@ -0,0 +1,134 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Compiler: 'MSVC2015' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'x86' + Compiler: 'MSVC2017' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017' +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'armv7' + Compiler: 'MSVC2017' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Compiler: 'MSVC2017' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'QNX_700' + Target arch: 'x86' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt deleted file mode 100644 index 58912679..00000000 --- a/coin/platform_configs/qtbase.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml new file mode 100644 index 00000000..dbe93909 --- /dev/null +++ b/coin/platform_configs/qtbase.yaml @@ -0,0 +1,12 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'x86_64' + Compiler: 'MSVC2015' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' +- + Template: 'qtci-linux-openSUSE-42.3-x86_64' + Target os: 'WebAssembly' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt deleted file mode 100644 index 2d378f84..00000000 --- a/coin/platform_configs/qtconnectivity.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml new file mode 100644 index 00000000..e46597cd --- /dev/null +++ b/coin/platform_configs/qtconnectivity.yaml @@ -0,0 +1,6 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Target os: 'WinRT_10' + Target arch: 'x86_64' + Compiler: 'MSVC2015' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index a36c94a5..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml new file mode 100644 index 00000000..7c4f6722 --- /dev/null +++ b/coin/platform_configs/qtdeclarative.yaml @@ -0,0 +1,12 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb' diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt deleted file mode 100644 index e05c4992..00000000 --- a/coin/platform_configs/qtsaferenderer.txt +++ /dev/null @@ -1,5 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ------------------------------------ ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ -qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml new file mode 100644 index 00000000..c2bc05e0 --- /dev/null +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -0,0 +1,13 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'Mingw73' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'Mingw73' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt deleted file mode 100644 index ad320b09..00000000 --- a/coin/platform_configs/qtsdk.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml new file mode 100644 index 00000000..2c001058 --- /dev/null +++ b/coin/platform_configs/qtsdk.yaml @@ -0,0 +1,8 @@ +- + Template: 'qtci-windows-10-x86-3' + Compiler: 'MSVC2017' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' +- + Template: 'qtci-linux-RHEL-6.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests' diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt deleted file mode 100644 index 3eb40a5b..00000000 --- a/coin/platform_configs/qtwebkit.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml new file mode 100644 index 00000000..01378ddc --- /dev/null +++ b/coin/platform_configs/qtwebkit.yaml @@ -0,0 +1,11 @@ +- + Template: 'qtci-windows-10-x86_64-10' + Target arch: 'x86' + Compiler: 'MSVC2017' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic' +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic' diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt deleted file mode 100644 index 82b086f9..00000000 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ /dev/null @@ -1,5 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- ------------- -------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -qtci-windows-8.1-x86_64 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml new file mode 100644 index 00000000..76664d06 --- /dev/null +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -0,0 +1,14 @@ +- + Template: 'qtci-windows-7-x86_64-4' + Compiler: 'MSVC2013' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' +- + Template: 'qtci-windows-8.1-x86_64' + Compiler: 'MSVC2013' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' +- + Template: 'qtci-windows-10-x86-3' + Compiler: 'MSVC2017' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- cgit v1.2.3 From 107fb060168d3a0e31d5afc32a2c627c6a7486bf Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 2 Jul 2019 09:21:04 +0300 Subject: Fix extra file and missing library in platform configurations Missing libraries in no-gui platform. Default.txt was supposed to be removed by 439a1eb2207417a6d2d0f14766e3e627035a9a7f Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f Reviewed-by: Aapo Keskimolo --- coin/platform_configs/default.txt | 30 ------------------------------ coin/platform_configs/default.yaml | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 coin/platform_configs/default.txt diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt deleted file mode 100644 index 690f3b17..00000000 --- a/coin/platform_configs/default.txt +++ /dev/null @@ -1,30 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features Configure arguments ------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib -qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index cf9ec074..6de43501 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -53,7 +53,7 @@ Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 59891119e7179a3e029e3e2b432f5a26f5ed5cbf Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 2 Jul 2019 23:02:19 +0200 Subject: Update submodules on '5.13' in qt5 Skip qtbase in this round. Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 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 08bcfc39..06010d41 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 08bcfc398d51e0e23783a4f02623e5b27e675092 +Subproject commit 06010d41368cd2f7e31fc13b98ac465886dc77a1 diff --git a/qtactiveqt b/qtactiveqt index e6435ef4..1efe161a 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e6435ef49c9d16ef288993d43b6f42c2b9c2fa32 +Subproject commit 1efe161af9f43c07abf447f60df7eca3e541e768 diff --git a/qtandroidextras b/qtandroidextras index 3af884ca..89edc161 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3af884ca599c476e078cb38461ad1117c57dc4a3 +Subproject commit 89edc161514a75b353b9efedb0a3628b62978e6e diff --git a/qtcharts b/qtcharts index 1256a1ed..2c594640 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1256a1edd5cdd84c4f74951f640056062a855116 +Subproject commit 2c594640231592d59654a9b1164f3278fa736e16 diff --git a/qtconnectivity b/qtconnectivity index e511f35a..7a73ef63 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e511f35a90608a4fb144b2c3dac37986d81cb41c +Subproject commit 7a73ef639d461200213bdcd7f447ed99a14d0a4a diff --git a/qtdatavis3d b/qtdatavis3d index 2e60208c..10fbcc8e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2e60208c8e2f81bac979fbdfd51f9079867d0203 +Subproject commit 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad diff --git a/qtdeclarative b/qtdeclarative index cff8d9f1..71d4a626 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cff8d9f1d2d309cd9417bb93386a1443ed1892c3 +Subproject commit 71d4a62661f771f1ac900fab02840f7863a0deed diff --git a/qtdoc b/qtdoc index 8ce4d6e9..64b116ee 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8ce4d6e90a19f6c5e75ee1aef982f4ce1a799f8f +Subproject commit 64b116ee06508fb403c706d4f27a523bd6e373c1 diff --git a/qtgamepad b/qtgamepad index bdb571e9..b68d01c6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit bdb571e9a3fbf789dde4406e88b63a6dbc215d00 +Subproject commit b68d01c6c58c96823654fa527a4a3feadea67694 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e25bb49a..fe48c188 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e25bb49afc375303b7a4e361612651497e3b762f +Subproject commit fe48c1884cd8e1c4194c3242b482a7b9eb509520 diff --git a/qtimageformats b/qtimageformats index c6a01635..d2c5409c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c6a01635a03b96311673c764e41501782e53e230 +Subproject commit d2c5409c1a4994052fd0c470148f1cd38f908d1c diff --git a/qtlocation b/qtlocation index 3833e418..06290ec4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3833e418682331cc76bfc287ae818557bdac447c +Subproject commit 06290ec441d9a031797fa91e499a1070f25715e7 diff --git a/qtlottie b/qtlottie index 553ec1bc..6d8f11a0 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 553ec1bc799f344a12e34c91720e13a469d85365 +Subproject commit 6d8f11a0ec0cc49fed98524259ee37fbe13e9525 diff --git a/qtmacextras b/qtmacextras index 511d6f25..7abc8c28 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 511d6f2502ddc480716e83be0d74a8c0f9387dc6 +Subproject commit 7abc8c2805797b6361af34676ac0484b2682aedf diff --git a/qtmultimedia b/qtmultimedia index e988f423..be84c810 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e988f423991084eb7187c420676e875ffb355188 +Subproject commit be84c8103b830c4c4bbda7ccfc72aea5b10e779b diff --git a/qtnetworkauth b/qtnetworkauth index 3d493559..039611b2 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3d4935594a5ba35a83e6098eaa8eac52aba22ca2 +Subproject commit 039611b2b78ad74fa0de7c87cb1415b50efdb7de diff --git a/qtpurchasing b/qtpurchasing index 0bf99caf..d7ff4e58 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0bf99caf06085b2f4ac04767b311ef0a544af046 +Subproject commit d7ff4e5827512eeb3624b8e9dbb736e3c2624e92 diff --git a/qtqa b/qtqa index 3908dc23..e9b796db 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 +Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 diff --git a/qtquickcontrols b/qtquickcontrols index 635af7d7..0ee7134d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 635af7d771d071c51b714b7aa183eca0d7066818 +Subproject commit 0ee7134d24bccb965a134dd1f4267a0bfda3de61 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fe127d8d..13bdd61c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fe127d8da4688b74dc6b9ad1f7170c8b5f1ef609 +Subproject commit 13bdd61c6597586f62558ca337c193ce03db26cc diff --git a/qtremoteobjects b/qtremoteobjects index 1e9b3af7..93cb11ec 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1e9b3af7b54b43d36ab0356b682b97f7a83a132a +Subproject commit 93cb11ec09086bf0e29fed2fd28f1d82ba2673c0 diff --git a/qtscript b/qtscript index 66e484db..32a1422c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 66e484db9353d1ac1c7557d9d4cd0bfe0819f61b +Subproject commit 32a1422c1e7614f77b951d77340d134222a31c60 diff --git a/qtscxml b/qtscxml index 8be5e493..d3ed5bcb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8be5e49379fa8c0f1e1e41ff4bce91e30699b352 +Subproject commit d3ed5bcb3e1a4175d31333db71dbd52443b727c9 diff --git a/qtsensors b/qtsensors index 9f93ec7f..9e475f2f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9f93ec7f85f856be98eed42a4e9d1d85032b0908 +Subproject commit 9e475f2f08cd528b773e67a304aa85d8d0d298d8 diff --git a/qtserialbus b/qtserialbus index 13d66512..4258ea1c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 13d66512a1b77cb0977e4345ee3e803e7dbafbb4 +Subproject commit 4258ea1cf66f3b4e710b05c87b77622c7115284b diff --git a/qtserialport b/qtserialport index c37d2c8f..493697bf 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c37d2c8f48f4e19ffd07ad14047a5276e9feaf6a +Subproject commit 493697bf951d8baa40203027baa0528f4d27cdca diff --git a/qtspeech b/qtspeech index 8ab911c1..0f40bdc4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8ab911c1b92d86f850f9c845bb8ca1f5a6009f01 +Subproject commit 0f40bdc4b6ec20c2a8e9e64481ae205668271b35 diff --git a/qtsvg b/qtsvg index 0eea9846..5fbdb5e5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0eea98461937a4c0f972c8fe1a70e0149b73e3f0 +Subproject commit 5fbdb5e5c361d42335427606f6bf9f461718d128 diff --git a/qttools b/qttools index 18f9ac9e..725e7cab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 18f9ac9e9489e48ea756bd89f6f40dd4499c42a3 +Subproject commit 725e7cabea0fb47f8890268a83ccdcf99722b328 diff --git a/qttranslations b/qttranslations index e943786f..55b11294 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e943786fb89d82212d1ad177725fe30c582864a3 +Subproject commit 55b11294296a7bbc3a3bdfe9d2f5b381abf01d92 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 02cc5cde..676ea1da 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 02cc5cded753495035457aac532e8bff225e1838 +Subproject commit 676ea1da22f63420974314ad7937c088377bd6ed diff --git a/qtwayland b/qtwayland index 37188068..a640a8d4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 37188068b61d55fc82970f90cf3ef9b09044e04c +Subproject commit a640a8d46afa6c096013c8656c3ebebe1701e551 diff --git a/qtwebchannel b/qtwebchannel index 986ce4a0..dff2332c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 986ce4a02ba9b33b908cdbdc46e3ceda0e50b99f +Subproject commit dff2332c68e7c20676702648457f9d11f90cc93b diff --git a/qtwebengine b/qtwebengine index 541176f7..bd864f64 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 541176f774034ebacb69fc93acf992da9c929892 +Subproject commit bd864f6418ed164c19a700fc4b6ebab3be431c62 diff --git a/qtwebglplugin b/qtwebglplugin index d1dd26bf..6aa5076f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d1dd26bf2d566a1b18781e566ec92bf707f63ff1 +Subproject commit 6aa5076f98d006e1ecd505835a2f77210a92a371 diff --git a/qtwebsockets b/qtwebsockets index b7b3ef26..44750221 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b7b3ef26b7da4d25c61bfbc193d3158c6d50330c +Subproject commit 44750221a97f0ad5da51ca51e2f14b701197c306 diff --git a/qtwebview b/qtwebview index 4c74374d..b7a622ca 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4c74374ddfa503c588bce531a387d946987c5c51 +Subproject commit b7a622cac9a5de26cd61203ee6dda6105826d293 diff --git a/qtwinextras b/qtwinextras index 374ab034..75ef3b62 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 374ab03458d48c8ef4fb67ba38cfdfd994cc0627 +Subproject commit 75ef3b628f2d162dd349bbe24e0809ea87c9e91a diff --git a/qtx11extras b/qtx11extras index 136f7679..cd886cd4 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 136f7679d066f7318b84795ca4fbc8857315a3ef +Subproject commit cd886cd4f08570953f1db3557eed974cc3c3737c diff --git a/qtxmlpatterns b/qtxmlpatterns index 610d28b4..0e1ee397 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 610d28b43d154b6bbc6f828b0ae97af803e113ac +Subproject commit 0e1ee397fe97d06b946e6fa296378721496ba3e5 -- cgit v1.2.3 From c6669046b4ee94fced4555a021cc25fbabe25302 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 2 Jul 2019 23:01:03 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- qttools | 2 +- qtwebglplugin | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 4f1b9f04..8d191720 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4f1b9f04f1a2063df764e6ec33c9f5f2e04d1ba1 +Subproject commit 8d1917209a04286b2befbaff7d8e0ed5256fb232 diff --git a/qtbase b/qtbase index 98f7df21..53428059 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 98f7df211464c79266e643a552d17067dd2b6c56 +Subproject commit 5342805920064dfe64c23690cd1d895a95478154 diff --git a/qtdeclarative b/qtdeclarative index 16289f35..64c1fbe9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 16289f35eb08a9b9a6d56ea8dec549b1f17e4daf +Subproject commit 64c1fbe96c68b1286a70242ff4922be140128cb2 diff --git a/qtnetworkauth b/qtnetworkauth index b62e6d61..e4a3b0c4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b62e6d612a44f23f96f719b10de1344c3d08602d +Subproject commit e4a3b0c4558b37d82f9292e12325089330dee5cd diff --git a/qttools b/qttools index b5bf195d..199329c9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b5bf195dc9c7576f627f37428c5ff2ff6e958411 +Subproject commit 199329c9df889d371dc5f717248fcc519e8952e3 diff --git a/qtwebglplugin b/qtwebglplugin index 9be2dd63..e80c1bf2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9be2dd636638620c82a48e72e92efccb5ed7e673 +Subproject commit e80c1bf24039ff36ff874f313be53ac2a70029de -- cgit v1.2.3 From ff74cdbe968edca1212691be966f2054a4587f1c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Jul 2019 23:01:17 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 53428059..f7090544 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5342805920064dfe64c23690cd1d895a95478154 +Subproject commit f70905448f612f52d4c3034faee61fc103b9eb7c diff --git a/qtdeclarative b/qtdeclarative index 64c1fbe9..1f01b44d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 64c1fbe96c68b1286a70242ff4922be140128cb2 +Subproject commit 1f01b44d20471a7f4a5029a4c0049e8296749fef diff --git a/qtimageformats b/qtimageformats index 9a4a2dd5..633f77e8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9a4a2dd5189e1659bce46eacef513b0c5680bb1e +Subproject commit 633f77e8e980996b095102ed462ffd228291b7fe diff --git a/qtlocation b/qtlocation index d61cf78b..a0cc254c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d61cf78b33ca15880c5ba4b31e450da37bd82987 +Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 diff --git a/qtremoteobjects b/qtremoteobjects index 3d729fab..c9243cb8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d729fabf2740af247f302c450f0bece7b85f881 +Subproject commit c9243cb82e991b4f97872282b91b64b512101738 diff --git a/qtserialbus b/qtserialbus index 70ab1b4e..533027e8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 70ab1b4e55f95011804371d3e04764ed87eed208 +Subproject commit 533027e8bbc17bf39f74ef99edeb395c25d80ab4 diff --git a/qttools b/qttools index 199329c9..f7a50cab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 199329c9df889d371dc5f717248fcc519e8952e3 +Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 -- cgit v1.2.3 From e41646897c5cc91aef1ffc2dd2fde0e7579d1537 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Jul 2019 23:30:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 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 d48e15d2..e8809595 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d48e15d235645cbd6b08cd5fc5eb7ae84678c1fe +Subproject commit e8809595df21ec6c6631f2148e15605c004e1ca7 diff --git a/qtactiveqt b/qtactiveqt index d9aa0a60..62a802cb 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d9aa0a60c1c627f141fad2eeba3c38480a1b61d3 +Subproject commit 62a802cbccc18330b010d7197a739d35ba9ae3c7 diff --git a/qtandroidextras b/qtandroidextras index 77485c52..a50f613a 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 77485c52210cb3d6a2899498331986ab64756811 +Subproject commit a50f613a37acf32886ab94c0be780c1f25493d52 diff --git a/qtbase b/qtbase index 2a756e29..1a14f7e9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a756e294e2efa4bcb2b51afd1c20822df251f29 +Subproject commit 1a14f7e91b065ed287a4982d4bea0027121926f4 diff --git a/qtcanvas3d b/qtcanvas3d index 9fe40cb1..73d5bba6 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9fe40cb19ef5196cd84d58faea82e023d6c32d38 +Subproject commit 73d5bba61d4a57dfce92da8c8c4dbda311af977b diff --git a/qtcharts b/qtcharts index 166eae80..8b79dba3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 166eae80efe685ffbc7097ebdbe3e68d12e7d2e0 +Subproject commit 8b79dba3fd204ca4161ec7e7293cb95d698ce9db diff --git a/qtconnectivity b/qtconnectivity index c17f8960..3394807b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c17f8960be6cec0c2f98f6ba071f3f2986db2260 +Subproject commit 3394807b3b0a234452b76e6295cb2362dc2c0cc0 diff --git a/qtdatavis3d b/qtdatavis3d index eef5e526..54a0844f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit eef5e52668df079d1c401814d11dad22ec94e166 +Subproject commit 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 diff --git a/qtdeclarative b/qtdeclarative index b8a85408..c5578b16 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b8a85408d943bffba403d783b9082bd279460bed +Subproject commit c5578b16d6454e708c8ce12661a85d41eeaaa758 diff --git a/qtdoc b/qtdoc index 2fa86c42..2eb2e153 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2fa86c42799b05f73797073061de1b1cbc7caefc +Subproject commit 2eb2e153f0f7b9c3112c269f87c0faf37df97edb diff --git a/qtgamepad b/qtgamepad index a266d285..656f3c13 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit a266d285e26a87ef0010dc05f5341e68a33fcb90 +Subproject commit 656f3c134c0cf00743deba3dfaaff7cb5bd17906 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8f6ebb39..f9664053 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8f6ebb395b3f9d6056b5d6bf76f6af6f43cab88d +Subproject commit f9664053132affe48a069235eb6561a32d38b2a7 diff --git a/qtimageformats b/qtimageformats index 79bf227d..7bdf0823 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 79bf227d7eba5eeb201ccdfee9b151ccb766df2a +Subproject commit 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 diff --git a/qtlocation b/qtlocation index 7df7bc13..63cd689a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7df7bc13f1b483504b01685888d3e3b6b6224a87 +Subproject commit 63cd689a400ee57f7e898e81290366c266537982 diff --git a/qtmacextras b/qtmacextras index 39f9523d..3247a8f3 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 39f9523df09f5333f277ad2b7bfb625df72c2ae9 +Subproject commit 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 diff --git a/qtmultimedia b/qtmultimedia index 9bbf9f0d..bc03bfdb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9bbf9f0d862b8d458e59690d36641618fb101b4e +Subproject commit bc03bfdbcf63a81f7261637378e2447e76dc7e97 diff --git a/qtnetworkauth b/qtnetworkauth index eccfd1e0..ee681478 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit eccfd1e04fde60022afdc80678316ecbd06031de +Subproject commit ee681478c4b05ab6640c0318ed4fa25d62c6f356 diff --git a/qtpurchasing b/qtpurchasing index 710a399d..6df36beb 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 710a399d4e8a9132172d45971152d18e1e16b3aa +Subproject commit 6df36bebdcb0a12069b0cabfed797ebc719b587d diff --git a/qtqa b/qtqa index ff4a74d5..e9b796db 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ff4a74d5c85d8f0d08acb8ef051b1038a1e0db7c +Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 diff --git a/qtquickcontrols b/qtquickcontrols index 558eb844..4e156bb2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 558eb844d59185d944c233348d2fef649e90b643 +Subproject commit 4e156bb26fb904663b0e13df1802dc2e0788b114 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bb88d844..ce7c431f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bb88d84475f7c4bb69528da5096f4d2c91667a3c +Subproject commit ce7c431fb23157fa5125d1102a594de045818a72 diff --git a/qtremoteobjects b/qtremoteobjects index c79feacd..1a924ee6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c79feacd40f57d4a38500bd94fa1f549c1ac47e7 +Subproject commit 1a924ee6bb250aa0a8d64d66491950bc3d86091e diff --git a/qtscript b/qtscript index 47ac322e..efbc554c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 47ac322e3e9a6f6350146d65bc87b981bba45b0f +Subproject commit efbc554c260f15b5c6dc23759eff96c106997a55 diff --git a/qtscxml b/qtscxml index 54c2106a..db44c53e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 54c2106a5fcc49eecd1b85ec93bf2f44c69a0d3f +Subproject commit db44c53e73479ee8ea98f911078b387735906f38 diff --git a/qtsensors b/qtsensors index ed0b4ed7..154ecd7b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ed0b4ed792504dc68d2f009ca19d69ef856002ba +Subproject commit 154ecd7b3048f22ee549c3838cc153cbc8cd33d2 diff --git a/qtserialbus b/qtserialbus index 9e51a7f4..1dda855c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9e51a7f46eb74b4fe5c18160845f51d522f8bddb +Subproject commit 1dda855cfc82db70fd937b1c33f9af57482a5d43 diff --git a/qtserialport b/qtserialport index 029d3991..9509b6d3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 029d399148c1a0b6d7c4e9a36a5be348558ceee9 +Subproject commit 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 diff --git a/qtspeech b/qtspeech index 4d83c0e3..1c004cd1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 4d83c0e3d3e231778ed805e36f546926191bfe26 +Subproject commit 1c004cd1f5c746a00c818bb6621100e82c110de4 diff --git a/qtsvg b/qtsvg index 1cb4cd6e..347de1dd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 +Subproject commit 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e diff --git a/qttools b/qttools index e42dd0a1..86f264b4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e42dd0a13ebf37f7402a4cf09a6fb62b8c740c76 +Subproject commit 86f264b491fced5efd37127ac1a31880fe909f5c diff --git a/qttranslations b/qttranslations index 6a580f7b..00556e09 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6a580f7b92cca74c824fca66c136df84725ecc62 +Subproject commit 00556e09790b83b3a2a83020b900e07829eaa0a4 diff --git a/qtwayland b/qtwayland index ec905708..acba020f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ec9057081f1094fbfeb11449bc533997731e4079 +Subproject commit acba020f1b6725e2d431636b1a2cfb075672ddcb diff --git a/qtwebchannel b/qtwebchannel index ee896f24..8a610433 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ee896f24693e8ac71102836cfa7550ab337f8edd +Subproject commit 8a610433fa26c2601d669b45e903566287923bec diff --git a/qtwebengine b/qtwebengine index 3b04c836..1f02df14 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3b04c83620a465a4f8876413c37696fbbc3a23d6 +Subproject commit 1f02df146c30adab0a9dffa0587afde1aa6a48b9 diff --git a/qtwebglplugin b/qtwebglplugin index 23c1d55b..ae907e4c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 23c1d55be7ee46c8950fe76c9740dc0462f1b462 +Subproject commit ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a diff --git a/qtwebsockets b/qtwebsockets index f582f7ec..dcf08a4c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac +Subproject commit dcf08a4c702f90cc092629078de48a0ad0d68562 diff --git a/qtwebview b/qtwebview index 22247ff9..de7e4c93 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 22247ff992fe5050d2438a064b572059aca7e39b +Subproject commit de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 diff --git a/qtwinextras b/qtwinextras index f2196b17..3fc1164e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2196b174bb0565055c8bc935b50ca90da5e6ffb +Subproject commit 3fc1164ee5464a317ac4daccc4edca09e4cae630 diff --git a/qtx11extras b/qtx11extras index bb5b7fd2..10cc8dec 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit bb5b7fd2e3fc365ec746d7e756556d410c5841d8 +Subproject commit 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 diff --git a/qtxmlpatterns b/qtxmlpatterns index ce43c8f6..1fe82f96 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ce43c8f6270518d801d91124ea1f32309c8e119d +Subproject commit 1fe82f967320b3c65f29ed704862f8c34a6c0c87 -- cgit v1.2.3 From bf785885050031e703a4142126a3d2b4bd05499f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Jul 2019 23:30:55 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 1a14f7e9..11d9af5d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1a14f7e91b065ed287a4982d4bea0027121926f4 +Subproject commit 11d9af5d957ac391a0c6cfdea4819df44b2b1560 diff --git a/qtdeclarative b/qtdeclarative index c5578b16..9a53834f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c5578b16d6454e708c8ce12661a85d41eeaaa758 +Subproject commit 9a53834f1e7fce2fc3b1ecc2a311faedbc371d37 diff --git a/qtwebengine b/qtwebengine index 1f02df14..fafc387a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1f02df146c30adab0a9dffa0587afde1aa6a48b9 +Subproject commit fafc387a32ac4b06709c0845c7f4cfd5164c1206 -- cgit v1.2.3 From d49ae7020c0f5a1de0dbba469234ea4198e8f8fb Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Mon, 24 Jun 2019 08:03:11 +0000 Subject: Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"" This reverts commit 84ff024609e4eca003c604294b4102e73deba8c3. Reason for revert: Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b Reviewed-by: Volker Hilsheimer --- coin/provisioning/common/windows/docker.ps1 | 85 ---------------------- .../qtci-windows-10-x86_64/95-docker.ps1 | 6 -- 2 files changed, 91 deletions(-) delete mode 100644 coin/provisioning/common/windows/docker.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 deleted file mode 100644 index 6f53eccd..00000000 --- a/coin/provisioning/common/windows/docker.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################# -## -## 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 Docker tool kits and Apple Bonjour on Windows. - -function DownloadAndInstall -{ - Param ( - [string]$externalUrl, - [string]$internalUrl, - [string]$package, - [string]$sha1, - [string]$parameters - ) - - Write-Host "Fetching $package from URL..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - - Write-Host "Installing $package..." - Run-Executable $package $parameters - - Write-Host "Remove $package..." - Remove-Item -Path $package -} - -# Install Docker Toolbox -$package = Get-DownloadLocation "DockerToolbox.exe" -$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" -$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" -Add-Path 'C:\Program Files\Docker Toolbox' -docker --version -docker-compose --version - -# Install Apple Bonjour -$package = Get-DownloadLocation "BonjourPSSetup.exe" -$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" -$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" -$sysInfoStr = systeminfo -if ($sysInfoStr -like "*A hypervisor has been detected*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V -} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX -} else { - Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 deleted file mode 100644 index df735855..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -# Disable Hyper-V from Windows 10 Pro/Enterprise -# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. -# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". -Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart - -. "$PSScriptRoot\..\common\windows\docker.ps1" -- cgit v1.2.3 From 231a5b777c046bef907eb3b1e35995da5bc7f79d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Jul 2019 09:35:53 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index bc8f8717..e72e60b1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc8f871784431638b5c43e1977c31ce2060affd3 +Subproject commit e72e60b1072e0bdefc0b899a5aad505fc3a8b3df diff --git a/qtconnectivity b/qtconnectivity index 7a73ef63..76260fce 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7a73ef639d461200213bdcd7f447ed99a14d0a4a +Subproject commit 76260fce994e9bac50c62b1c777e56d80848c0df diff --git a/qtdeclarative b/qtdeclarative index 71d4a626..6063dd35 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 71d4a62661f771f1ac900fab02840f7863a0deed +Subproject commit 6063dd35b8dca1f6ca40f0133a5f21c1c2179316 diff --git a/qtdoc b/qtdoc index 64b116ee..c66e10ae 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 64b116ee06508fb403c706d4f27a523bd6e373c1 +Subproject commit c66e10ae68d2bf61f471b0a66216428b863406a4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 13bdd61c..fa0a2860 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 13bdd61c6597586f62558ca337c193ce03db26cc +Subproject commit fa0a2860e9ca7bb035fec21ceb0dfe919c7d0dca diff --git a/qttools b/qttools index 725e7cab..0119d409 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 725e7cabea0fb47f8890268a83ccdcf99722b328 +Subproject commit 0119d409921c88ed5e9b0883098fc84c4526fb37 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 676ea1da..fe4cb8c9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 676ea1da22f63420974314ad7937c088377bd6ed +Subproject commit fe4cb8c970ccc8801f18b953ac7d0969943a9a0b diff --git a/qtwebengine b/qtwebengine index bd864f64..300ef938 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bd864f6418ed164c19a700fc4b6ebab3be431c62 +Subproject commit 300ef938202df077bb2a6b8fa1a082c4517346cb -- cgit v1.2.3 From b769633c2e3911c806494bf7fd5ecc584d9a617c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Jul 2019 23:30:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 11d9af5d..90a29a73 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 11d9af5d957ac391a0c6cfdea4819df44b2b1560 +Subproject commit 90a29a73f84ffd6386beb37690c328b039423fab diff --git a/qtconnectivity b/qtconnectivity index 3394807b..0fc7e18b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3394807b3b0a234452b76e6295cb2362dc2c0cc0 +Subproject commit 0fc7e18bf7a24c9408602242d51a852905dfd0da diff --git a/qtdeclarative b/qtdeclarative index 9a53834f..1982d1b1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9a53834f1e7fce2fc3b1ecc2a311faedbc371d37 +Subproject commit 1982d1b1aa55ae44a1a775a5745e5c2f11001398 diff --git a/qtmultimedia b/qtmultimedia index bc03bfdb..1b70bbed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bc03bfdbcf63a81f7261637378e2447e76dc7e97 +Subproject commit 1b70bbed49d12af86851a505a5aa5428b9e0c567 diff --git a/qtsensors b/qtsensors index 154ecd7b..777204e4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 154ecd7b3048f22ee549c3838cc153cbc8cd33d2 +Subproject commit 777204e439c8edd35e021a73cddd80f4c85ef4f5 -- cgit v1.2.3 From 84e57b1fb03b449cc25bb67a3c32d09462793571 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 5 Jul 2019 11:00:29 +0200 Subject: Try to update sha1s of submodules to get a working qt5 wip/qt6 branch qtbase, qtremoteobjects, qtquickcontrols, qtquickcontrols2 qtlocation and qttools are updated to latest dev HEAD. qtimageformats, qtnetworkauth, qtsvg, qtdeclarative are updated to point to latest wip/qt6 HEAD. Change-Id: I70938d0d258208670c7d3e3f73fe3e3b274c2eb2 Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index a0c4b6f3..bcd4b140 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0c4b6f34546bdd22167a76a0540d37e9a37c0cf +Subproject commit bcd4b14026094d0077ad1069054676cc6da96251 diff --git a/qtdeclarative b/qtdeclarative index 3fff0304..0f2178a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3fff03048a48aa7ead6e888165b2ae5a118d675c +Subproject commit 0f2178a7e3cba4992f8b6e32927534daa5c6ee7e diff --git a/qtimageformats b/qtimageformats index 9a4a2dd5..27620737 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9a4a2dd5189e1659bce46eacef513b0c5680bb1e +Subproject commit 2762073738d0343b2ba6e38624de2040c34bc393 diff --git a/qtlocation b/qtlocation index 971423c5..a0cc254c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 971423c512623b84618cfc73b992da1f1dc014f8 +Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 diff --git a/qtnetworkauth b/qtnetworkauth index 8bc6feb3..c82ade62 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8bc6feb36a471006cfa4b62189edc3d7fd67bf78 +Subproject commit c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8c diff --git a/qtquickcontrols b/qtquickcontrols index d2a661f1..81c5d9cd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d2a661f16e9982c45260efb9875b83c581b82287 +Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da150dac..9cd1ee92 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da150dacec8a2a68d290141b1e0ab268ce648edb +Subproject commit 9cd1ee923eea11d084d41158458bbb73a906c75c diff --git a/qtremoteobjects b/qtremoteobjects index 99df6cb9..25d9b378 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 99df6cb9fc2cd598dd33c89e7781f5963b739508 +Subproject commit 25d9b378a42daa723dd79191f0f2cfd03285651a diff --git a/qtsvg b/qtsvg index 1983ba1d..f84b76cf 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 +Subproject commit f84b76cfe3f662684222f55981e34cee7a62ddff diff --git a/qttools b/qttools index ee122e6a..f7a50cab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ee122e6a0752634ed9dddf0937fa386709059c75 +Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 diff --git a/qtwayland b/qtwayland index 14d37a53..28572232 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 14d37a53a674d7dbef32e718ae391e265fad5fac +Subproject commit 2857223212ef56810b61ea97fb977573700ab1e0 -- cgit v1.2.3 From e4b596fcfe4537f3af54dcff9fddbd9f2574acab Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 7 Feb 2019 11:35:22 +0100 Subject: Add the docker images for CoAP test servers This change includes: - Docker image for the test server to test non-secure and PSK-based CoAP security modes. - Docker image for the test server to test X.509 certificate-based CoAP security mode. Change-Id: Ice661917591ecaee8ebc3500209bcffc08981f65 Reviewed-by: Ryan Chu --- .../common/shared/testserver/californium/Dockerfile | 15 +++++++++++++++ .../common/shared/testserver/freecoap/Dockerfile | 20 ++++++++++++++++++++ .../common/shared/testserver/settings.sh | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/shared/testserver/californium/Dockerfile create mode 100644 coin/provisioning/common/shared/testserver/freecoap/Dockerfile diff --git a/coin/provisioning/common/shared/testserver/californium/Dockerfile b/coin/provisioning/common/shared/testserver/californium/Dockerfile new file mode 100644 index 00000000..90722510 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu:18.04 + +RUN apt-get update && apt-get -y install git maven default-jdk avahi-daemon + +RUN mkdir -p /root/src/ + +# Get californium-based CoAP test server +WORKDIR /root/src +RUN git clone https://github.com/selart/californium.git +WORKDIR /root/src/californium +RUN mvn clean install -q -DskipTests + +WORKDIR / + +EXPOSE 5683/udp 5684/udp diff --git a/coin/provisioning/common/shared/testserver/freecoap/Dockerfile b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile new file mode 100644 index 00000000..2c665bd5 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile @@ -0,0 +1,20 @@ +FROM ubuntu:18.04 + +RUN apt-get update && apt-get -y install git avahi-daemon autoconf automake libtool make libgnutls28-dev + +RUN mkdir -p /root/src/ + +# Get FreeCoAP test server +WORKDIR /root/src +RUN git clone https://github.com/keith-cullen/FreeCoAP.git +WORKDIR /root/src/FreeCoAP +RUN autoreconf --install +RUN ./configure +RUN make +RUN make install +WORKDIR /root/src/FreeCoAP/sample/time_server +RUN make + +WORKDIR / + +EXPOSE 5685/udp diff --git a/coin/provisioning/common/shared/testserver/settings.sh b/coin/provisioning/common/shared/testserver/settings.sh index 4819cef2..27832773 100644 --- a/coin/provisioning/common/shared/testserver/settings.sh +++ b/coin/provisioning/common/shared/testserver/settings.sh @@ -34,5 +34,5 @@ set -ex # A list of test servers to be provisioned -testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables' +testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables californium freecoap' testserver="$testserver apache2_18.04 squid_18.04 vsftpd_18.04 ftp-proxy_18.04 danted_18.04 echo_18.04 cyrus_18.04 iptables_18.04" -- cgit v1.2.3 From e8c8c94278b986c8912693f841f7e31be9647227 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 7 Jul 2019 23:30:48 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 90a29a73..f5745609 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 90a29a73f84ffd6386beb37690c328b039423fab +Subproject commit f5745609481dd4f660e196b8438e25615d3dfe0a -- cgit v1.2.3 From 57ea35cacea9be78550ce0351357282cd900e56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 12 Jul 2019 14:56:27 +0200 Subject: Un-ignore qtwebengine in dev Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960 Reviewed-by: Simon Hausmann Reviewed-by: Qt CI Bot --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f954739a..b3c46af7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = dev - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative -- cgit v1.2.3 From cfe2c097e90a726bd5702df1adc34bd51915366a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 14 Jul 2019 23:30:43 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index e8809595..650a169a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e8809595df21ec6c6631f2148e15605c004e1ca7 +Subproject commit 650a169aa618dad762957337ba16f7fba22e5d05 diff --git a/qtbase b/qtbase index f5745609..7d3a55cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f5745609481dd4f660e196b8438e25615d3dfe0a +Subproject commit 7d3a55cbd219bee4e071df5588c87723d9c8f7c4 diff --git a/qtdeclarative b/qtdeclarative index 1982d1b1..141ffbe3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1982d1b1aa55ae44a1a775a5745e5c2f11001398 +Subproject commit 141ffbe37e9263829a156fc1f4d7b93a2bf311be diff --git a/qtmultimedia b/qtmultimedia index 1b70bbed..bddfae90 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1b70bbed49d12af86851a505a5aa5428b9e0c567 +Subproject commit bddfae90c6ae90f50d48ce9be5e70cb38c54385a diff --git a/qtqa b/qtqa index e9b796db..c0bdb898 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 +Subproject commit c0bdb8987cec136b22b72da00d044e57cd2fe644 diff --git a/qtremoteobjects b/qtremoteobjects index 1a924ee6..c973a6eb 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1a924ee6bb250aa0a8d64d66491950bc3d86091e +Subproject commit c973a6eb63b52db6bcb4c15854797228903fc756 diff --git a/qtsensors b/qtsensors index 777204e4..70c2dd24 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 777204e439c8edd35e021a73cddd80f4c85ef4f5 +Subproject commit 70c2dd24800527908e92fb0ce181b939dbd6141e diff --git a/qtserialbus b/qtserialbus index 1dda855c..43d746c2 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1dda855cfc82db70fd937b1c33f9af57482a5d43 +Subproject commit 43d746c2c0c87c8694e835f3b052317c8fa02482 diff --git a/qttools b/qttools index 86f264b4..a9790627 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 86f264b491fced5efd37127ac1a31880fe909f5c +Subproject commit a9790627873d17f91f29c9bd8be0fb609ec29f03 diff --git a/qtwayland b/qtwayland index acba020f..5ca9f28f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit acba020f1b6725e2d431636b1a2cfb075672ddcb +Subproject commit 5ca9f28f4b272d3265b97c16029071a0070195a6 diff --git a/qtwebengine b/qtwebengine index fafc387a..fef43d7b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fafc387a32ac4b06709c0845c7f4cfd5164c1206 +Subproject commit fef43d7b6fad44f9ee3de12ea49cc418245b1844 -- cgit v1.2.3 From 5a16472559124d588c578e9fb0d85622fbc70ace Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 23 Jul 2019 09:42:20 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248 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 +- qtlottie | 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 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 06010d41..bd095834 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 06010d41368cd2f7e31fc13b98ac465886dc77a1 +Subproject commit bd09583403b27dedb3d6a7c7c737b0c1a49432e1 diff --git a/qtactiveqt b/qtactiveqt index 1efe161a..6746b4c3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1efe161af9f43c07abf447f60df7eca3e541e768 +Subproject commit 6746b4c3736eb08721e68f3a051bf27b699487f3 diff --git a/qtandroidextras b/qtandroidextras index 89edc161..c158f8d5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 89edc161514a75b353b9efedb0a3628b62978e6e +Subproject commit c158f8d5179957084fd7ec1c2f97086b45604f56 diff --git a/qtbase b/qtbase index e72e60b1..5f1cf8e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e72e60b1072e0bdefc0b899a5aad505fc3a8b3df +Subproject commit 5f1cf8e0f5da36063202d46463c2d9e79d841a4d diff --git a/qtcharts b/qtcharts index 2c594640..aa765c1b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2c594640231592d59654a9b1164f3278fa736e16 +Subproject commit aa765c1b7802746e6a97043b62a142eb2d2137af diff --git a/qtconnectivity b/qtconnectivity index 76260fce..9aca6982 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 76260fce994e9bac50c62b1c777e56d80848c0df +Subproject commit 9aca6982435eb5acb69b95b17f33bc454a94487b diff --git a/qtdatavis3d b/qtdatavis3d index 10fbcc8e..3206729a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad +Subproject commit 3206729aa704d9c7cdfaa734f177334d5c11ae72 diff --git a/qtdeclarative b/qtdeclarative index 6063dd35..f72db4de 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6063dd35b8dca1f6ca40f0133a5f21c1c2179316 +Subproject commit f72db4de7f446c522db3f78b67c3b2bcc02b172a diff --git a/qtdoc b/qtdoc index c66e10ae..e784b193 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c66e10ae68d2bf61f471b0a66216428b863406a4 +Subproject commit e784b193f8892c169890cc4783cfcc5c61243dda diff --git a/qtgamepad b/qtgamepad index b68d01c6..027a1dfd 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit b68d01c6c58c96823654fa527a4a3feadea67694 +Subproject commit 027a1dfd3eca382dab3f3f17e7f43ccb84e329be diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fe48c188..3b3b3f85 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fe48c1884cd8e1c4194c3242b482a7b9eb509520 +Subproject commit 3b3b3f85ddd472bdae168f210e62dc2868997aae diff --git a/qtimageformats b/qtimageformats index d2c5409c..f9cd56d9 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d2c5409c1a4994052fd0c470148f1cd38f908d1c +Subproject commit f9cd56d976ca89618014b66acb09cf4d380924c5 diff --git a/qtlocation b/qtlocation index 06290ec4..46ae4e4d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 06290ec441d9a031797fa91e499a1070f25715e7 +Subproject commit 46ae4e4db687b8a12e639d9b248546652b680c04 diff --git a/qtlottie b/qtlottie index 6d8f11a0..4c3207a7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6d8f11a0ec0cc49fed98524259ee37fbe13e9525 +Subproject commit 4c3207a7385a3ba402884bb50136bbe7b70baa2e diff --git a/qtmacextras b/qtmacextras index 7abc8c28..f44061fa 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 7abc8c2805797b6361af34676ac0484b2682aedf +Subproject commit f44061fa0547d048661d1efa8444da7c757fa39c diff --git a/qtmultimedia b/qtmultimedia index be84c810..5825dd27 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit be84c8103b830c4c4bbda7ccfc72aea5b10e779b +Subproject commit 5825dd2773755cea236d9816cc7541bc20f9cb80 diff --git a/qtnetworkauth b/qtnetworkauth index 039611b2..c2bf9b42 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 039611b2b78ad74fa0de7c87cb1415b50efdb7de +Subproject commit c2bf9b420f29e4b001d6f85b918be5fb89c87564 diff --git a/qtpurchasing b/qtpurchasing index d7ff4e58..a0f911a2 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d7ff4e5827512eeb3624b8e9dbb736e3c2624e92 +Subproject commit a0f911a29eb055de1e9dc2d3e78a1f03ccead5da diff --git a/qtqa b/qtqa index e9b796db..c0bdb898 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 +Subproject commit c0bdb8987cec136b22b72da00d044e57cd2fe644 diff --git a/qtquickcontrols b/qtquickcontrols index 0ee7134d..845cd17a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0ee7134d24bccb965a134dd1f4267a0bfda3de61 +Subproject commit 845cd17a498d6008992b04ec4ca1984e6e73de3c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fa0a2860..83813e43 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fa0a2860e9ca7bb035fec21ceb0dfe919c7d0dca +Subproject commit 83813e43405109478769010acf2caf85a4229501 diff --git a/qtremoteobjects b/qtremoteobjects index 93cb11ec..cbef241d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 93cb11ec09086bf0e29fed2fd28f1d82ba2673c0 +Subproject commit cbef241ded4c7255f163af962293c201b27f341f diff --git a/qtrepotools b/qtrepotools index 61191bf3..da0a7744 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf +Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca diff --git a/qtscript b/qtscript index 32a1422c..91234654 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 32a1422c1e7614f77b951d77340d134222a31c60 +Subproject commit 912346548c774cdcc4383cc30e06f106dbf77a97 diff --git a/qtscxml b/qtscxml index d3ed5bcb..1323d465 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d3ed5bcb3e1a4175d31333db71dbd52443b727c9 +Subproject commit 1323d465b4698296533cf6c73ea5ace65dd0ce94 diff --git a/qtsensors b/qtsensors index 9e475f2f..6390e165 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9e475f2f08cd528b773e67a304aa85d8d0d298d8 +Subproject commit 6390e165dc2df3bc48c3655ed45d1b952d1f2bae diff --git a/qtserialbus b/qtserialbus index 4258ea1c..6a19c210 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4258ea1cf66f3b4e710b05c87b77622c7115284b +Subproject commit 6a19c2100180747204e9e77fd0286061ff8a46d7 diff --git a/qtserialport b/qtserialport index 493697bf..335f1d02 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 493697bf951d8baa40203027baa0528f4d27cdca +Subproject commit 335f1d02dc134bf11277c0573553c7c838cc6a9f diff --git a/qtspeech b/qtspeech index 0f40bdc4..aa450db4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0f40bdc4b6ec20c2a8e9e64481ae205668271b35 +Subproject commit aa450db462db5fca847ed05c1e05c1779161cc8b diff --git a/qtsvg b/qtsvg index 5fbdb5e5..1bdd9b7b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5fbdb5e5c361d42335427606f6bf9f461718d128 +Subproject commit 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 diff --git a/qttools b/qttools index 0119d409..1b9972cd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0119d409921c88ed5e9b0883098fc84c4526fb37 +Subproject commit 1b9972cde24a8d8bb7f24ddbb196666456a1ce6b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe4cb8c9..6143eec2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe4cb8c970ccc8801f18b953ac7d0969943a9a0b +Subproject commit 6143eec2525af08e6aab895bcf64c2745a427f13 diff --git a/qtwayland b/qtwayland index a640a8d4..11a726d8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a640a8d46afa6c096013c8656c3ebebe1701e551 +Subproject commit 11a726d88672b43bef6d360bebfbe79257e97b09 diff --git a/qtwebchannel b/qtwebchannel index dff2332c..c5d4f9b1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit dff2332c68e7c20676702648457f9d11f90cc93b +Subproject commit c5d4f9b1a653a242b6231cbdea8ccfc751180beb diff --git a/qtwebengine b/qtwebengine index 300ef938..f43d9dc4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 300ef938202df077bb2a6b8fa1a082c4517346cb +Subproject commit f43d9dc448f0fd2073f44ea696205969ffd0d9c8 diff --git a/qtwebglplugin b/qtwebglplugin index 6aa5076f..95957bbe 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 6aa5076f98d006e1ecd505835a2f77210a92a371 +Subproject commit 95957bbecc40e5efb163ab123c2a7d8d04005bef diff --git a/qtwebsockets b/qtwebsockets index 44750221..0634c810 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 44750221a97f0ad5da51ca51e2f14b701197c306 +Subproject commit 0634c8104558dbb7acd314d52cf4b039c8c3689d diff --git a/qtwebview b/qtwebview index b7a622ca..5c80bba0 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b7a622cac9a5de26cd61203ee6dda6105826d293 +Subproject commit 5c80bba07d09f498027586a32b0f937d26cca1dd diff --git a/qtwinextras b/qtwinextras index 75ef3b62..da9ce653 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 75ef3b628f2d162dd349bbe24e0809ea87c9e91a +Subproject commit da9ce653ee04b9b93cfa95d4d7071d0153286c71 diff --git a/qtx11extras b/qtx11extras index cd886cd4..d6090610 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit cd886cd4f08570953f1db3557eed974cc3c3737c +Subproject commit d6090610969cd7f2f5554e6239b0e35f8755196a diff --git a/qtxmlpatterns b/qtxmlpatterns index 0e1ee397..84e44bf5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0e1ee397fe97d06b946e6fa296378721496ba3e5 +Subproject commit 84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a -- cgit v1.2.3 From 2237ea6d0c731756a0d0a47b6d72a3861ec276c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Jul 2019 23:30:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 650a169a..1bb43d7b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 650a169aa618dad762957337ba16f7fba22e5d05 +Subproject commit 1bb43d7be48813ba318bc2613d020dc8a3b71746 diff --git a/qtbase b/qtbase index 7d3a55cb..86f91bf0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7d3a55cbd219bee4e071df5588c87723d9c8f7c4 +Subproject commit 86f91bf0f707e34392fbdf424d6914e7cf6bb4e6 diff --git a/qtconnectivity b/qtconnectivity index 0fc7e18b..8110fdd4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0fc7e18bf7a24c9408602242d51a852905dfd0da +Subproject commit 8110fdd4c6d80d05934768fa808a4cb187212fe0 diff --git a/qtdeclarative b/qtdeclarative index 141ffbe3..1dad2029 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 141ffbe37e9263829a156fc1f4d7b93a2bf311be +Subproject commit 1dad2029a5bdbc40b244f72f995d70d27ed98e62 diff --git a/qtimageformats b/qtimageformats index 7bdf0823..d4861c2a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 +Subproject commit d4861c2a836f323e1c4694bf7830e69ef845b8ce diff --git a/qtmultimedia b/qtmultimedia index bddfae90..d9dd7f48 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bddfae90c6ae90f50d48ce9be5e70cb38c54385a +Subproject commit d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ce7c431f..1d06eb3f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ce7c431fb23157fa5125d1102a594de045818a72 +Subproject commit 1d06eb3f8215b67c5061ee3a076df405724ff7ee diff --git a/qtrepotools b/qtrepotools index 61191bf3..da0a7744 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf +Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca diff --git a/qtserialbus b/qtserialbus index 43d746c2..4fb3e302 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 43d746c2c0c87c8694e835f3b052317c8fa02482 +Subproject commit 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 diff --git a/qtwebengine b/qtwebengine index fef43d7b..002e4769 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fef43d7b6fad44f9ee3de12ea49cc418245b1844 +Subproject commit 002e47692b071400e8917a1604b37039860f86c2 -- cgit v1.2.3 From 7001f157657beb37b1813bc45bff487dd83b12b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Jul 2019 11:02:14 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ib6e8c649e6e2f6a9c1fd60a459687426aec1a149 Reviewed-by: Liang Qi --- qt3d | 2 +- qtimageformats | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index bd095834..7e60b6d5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bd09583403b27dedb3d6a7c7c737b0c1a49432e1 +Subproject commit 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 diff --git a/qtimageformats b/qtimageformats index f9cd56d9..adc70a52 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f9cd56d976ca89618014b66acb09cf4d380924c5 +Subproject commit adc70a5244a8a7c3d554cbcfc3f38f8396974900 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 83813e43..200b4751 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 83813e43405109478769010acf2caf85a4229501 +Subproject commit 200b47519ffc61ebd06cda9a4c452d7b15e37d33 diff --git a/qtserialbus b/qtserialbus index 6a19c210..5d82bf36 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6a19c2100180747204e9e77fd0286061ff8a46d7 +Subproject commit 5d82bf36c526d55951127c95d8c0aa5abc2e199d diff --git a/qttools b/qttools index 1b9972cd..466d87a7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b9972cde24a8d8bb7f24ddbb196666456a1ce6b +Subproject commit 466d87a7c92436e0da98005475065dc212cac71c diff --git a/qtwebengine b/qtwebengine index f43d9dc4..7090472a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f43d9dc448f0fd2073f44ea696205969ffd0d9c8 +Subproject commit 7090472ade970404a1199556b1296d8ac3355d47 -- cgit v1.2.3 From dd7a80d757eda6ae9213c40486e2ae2bea672135 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 24 Jul 2019 23:31:09 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 1bb43d7b..309c3139 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1bb43d7be48813ba318bc2613d020dc8a3b71746 +Subproject commit 309c3139f8111ea246dd3a1f996578d0b35bb151 diff --git a/qtbase b/qtbase index 86f91bf0..e4c1feae 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 86f91bf0f707e34392fbdf424d6914e7cf6bb4e6 +Subproject commit e4c1feae5c0bec21e24edbf5acacd248dd121634 diff --git a/qtconnectivity b/qtconnectivity index 8110fdd4..c9d585da 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8110fdd4c6d80d05934768fa808a4cb187212fe0 +Subproject commit c9d585da2ddd49108d7b56f480bcfc9d71b67dbf diff --git a/qtdeclarative b/qtdeclarative index 1dad2029..d94dd247 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1dad2029a5bdbc40b244f72f995d70d27ed98e62 +Subproject commit d94dd247ecd6753150dc2a7ef6be4ccb482e9423 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1d06eb3f..da06da57 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1d06eb3f8215b67c5061ee3a076df405724ff7ee +Subproject commit da06da57002b64cf4bcde0ca708b3275a5f919ae diff --git a/qtremoteobjects b/qtremoteobjects index c973a6eb..2bcda9d9 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c973a6eb63b52db6bcb4c15854797228903fc756 +Subproject commit 2bcda9d9f45858ac196d9972162c870ac0a6f217 diff --git a/qtwebengine b/qtwebengine index 002e4769..9dce1c5b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 002e47692b071400e8917a1604b37039860f86c2 +Subproject commit 9dce1c5b12db094cdc469d7d68eb3124f9393dc7 -- cgit v1.2.3 From c31548830f8dad308d2b7407b714fa2d4d3148a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 24 Jul 2019 22:31:11 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ia71bd5cb97367e0a750e090bfbcacfc89ef41490 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 5f1cf8e0..547f216e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f1cf8e0f5da36063202d46463c2d9e79d841a4d +Subproject commit 547f216efdef3667b0b23ecddce93e5184806800 diff --git a/qtdeclarative b/qtdeclarative index f72db4de..aeec2f94 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f72db4de7f446c522db3f78b67c3b2bcc02b172a +Subproject commit aeec2f94c376c9a0e84bbbb3be4652384c7da113 diff --git a/qtmultimedia b/qtmultimedia index 5825dd27..dbdcc1b0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5825dd2773755cea236d9816cc7541bc20f9cb80 +Subproject commit dbdcc1b099dc25ffb707a2441191463de33c51f3 diff --git a/qttools b/qttools index 466d87a7..6d19911c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 466d87a7c92436e0da98005475065dc212cac71c +Subproject commit 6d19911c0db508a1c0079890a0adc8f6ab87bcf7 diff --git a/qtwebengine b/qtwebengine index 7090472a..08053c0a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7090472ade970404a1199556b1296d8ac3355d47 +Subproject commit 08053c0a8a2cfc01c4d92155342a98d610e12473 -- cgit v1.2.3 From f470b8eabe56abbb0fc4399bbef14177840f694b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Jul 2019 22:31:04 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I0ba5aab5d93df54742604eca6a893cea11cf19c0 Reviewed-by: Qt Submodule Update Bot --- qtwayland | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtwayland b/qtwayland index 11a726d8..f4636b93 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 11a726d88672b43bef6d360bebfbe79257e97b09 +Subproject commit f4636b934f90b2a07b09f1925a86440cf1944d08 diff --git a/qtwebengine b/qtwebengine index 08053c0a..1e11cc6c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 08053c0a8a2cfc01c4d92155342a98d610e12473 +Subproject commit 1e11cc6c856b731a7e8d42a433840671c46e97a8 -- cgit v1.2.3 From cb8d38fd9cbfc3c83efffba3fc2587378e9f7476 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 03:24:42 +0300 Subject: Provisioning: don't re-run Conan 5 times if there is no error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08 Reviewed-by: Mårten Nordheim Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 74c21e20..0e9b9bc2 100644 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 @@ -42,7 +42,7 @@ function Run-Conan-Install Push-Location $outpwd Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", ` '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" break; } catch { if ($i -eq 5) { -- cgit v1.2.3 From 645bd71404dde95c0eb1679b798b4349fe8ceca4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 02:30:05 +0300 Subject: Provisioning: Run-Executable should print stdout and stderr to log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3085 Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/helpers.ps1 | 36 ++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 6e8e0365..ba35f6b5 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -22,14 +22,46 @@ function Run-Executable [string]$Executable=$(throw("You must specify a program to run.")), [string[]]$Arguments ) + + $stdoutFile = [System.IO.Path]::GetTempFileName() + $stderrFile = [System.IO.Path]::GetTempFileName() + if ([string]::IsNullOrEmpty($Arguments)) { Write-Host "Running `"$Executable`"" - $p = Start-Process -FilePath "$Executable" -Wait -PassThru + $p = Start-Process -FilePath "$Executable" -Wait -PassThru ` + -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile } else { Write-Host "Running `"$Executable`" with arguments `"$Arguments`"" - $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru + $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru ` + -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile Wait-Process -InputObject $p } + + $stdoutContent = [System.IO.File]::ReadAllText($stdoutFile) + $stderrContent = [System.IO.File]::ReadAllText($stderrFile) + Remove-Item -Path $stdoutFile, $stderrFile -Force -ErrorAction Ignore + + $hasOutput = $false + if ([string]::IsNullOrEmpty($stdoutContent) -eq $false -or [string]::IsNullOrEmpty($stderrContent) -eq $false) { + $hasOutput = $true + Write-Host + Write-Host "======================================================================" + } + if ([string]::IsNullOrEmpty($stdoutContent) -eq $false) { + Write-Host "stdout of `"$Executable`":" + Write-Host "======================================================================" + Write-Host $stdoutContent + Write-Host "======================================================================" + } + if ([string]::IsNullOrEmpty($stderrContent) -eq $false) { + Write-Host "stderr of `"$Executable`":" + Write-Host "======================================================================" + Write-Host $stderrContent + Write-Host "======================================================================" + } + if ($hasOutput) { + Write-Host + } if ($p.ExitCode -ne 0) { throw "Process $($Executable) exited with exit code $($p.ExitCode)" } -- cgit v1.2.3 From 22c427b3699c1b191373af93adadb66e0f39b755 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 23 Jul 2019 00:53:36 +0300 Subject: Use msiexec to install Strawberry Perl from msi package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently provisioning fails with following error: "This command cannot be run due to the error: %1 is not a valid Win32 application." Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/install-strawberry-perl.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install-strawberry-perl.ps1 b/coin/provisioning/common/windows/install-strawberry-perl.ps1 index c80f16a4..7e288603 100644 --- a/coin/provisioning/common/windows/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1 @@ -50,7 +50,7 @@ $strawberryPackage = "C:\Windows\Temp\" + $installer_name Download $url_official $url_cache $strawberryPackage Verify-Checksum $strawberryPackage $sha1 -Run-Executable "$strawberryPackage" "/QB INSTALLDIR=C:\strawberry REBOOT=REALLYSUPPRESS" +Run-Executable "msiexec" "/quiet /i $strawberryPackage INSTALLDIR=C:\strawberry REBOOT=REALLYSUPPRESS" Write-Host "Cleaning $strawberryPackage.." Remove-Item -Recurse -Force -Path "$strawberryPackage" -- cgit v1.2.3 From f12c22646336893c6db5e8117498395baa0c3230 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 24 Jul 2019 14:04:08 +0300 Subject: Provisioning: install-msys2.ps1 must run its commands synchronously MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] Using bash instead of msys2_shell.cmd allows Start-Process to actually wait for the end of command execution. [*] cpan requires "yes" to be typed by user when it's run first time, otherwise it hangs indefinitely waiting for input. [*] Stop gpg-agent and dirmngr started in the background to prevent CI session from hanging. Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6 Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/install-msys2.ps1 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c4a9680..e88c8f07 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -33,8 +33,6 @@ . "$PSScriptRoot\helpers.ps1" -# This script installs 7-Zip - $version = "20181211" $prog = "msys2" if (Is64BitWinHost) { @@ -58,13 +56,17 @@ $TargetLocation = "C:\Utils" Download $url_official $url_cache $PackagePath Verify-Checksum $PackagePath $sha1 Extract-tar_gz $PackagePath $TargetLocation -$msys = "$TargetLocation\$folder\msys2_shell.cmd" +$bash = "$TargetLocation\$folder\usr\bin\bash" # 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`"" +Run-Executable "$bash" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Run-Executable "$bash" "`"-l`" `"-c`" `"yes | cpan -i Text::Template Test::More`"" Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" -Write-Output "7-Zip = $version" >> ~\versions.txt +# pacman-key launches gpg-agent and dirmngr in the background, see https://github.com/Alexpux/MSYS2-pacman/issues/56 +Stop-Process -Name "gpg-agent" -ErrorAction Ignore +Stop-Process -Name "dirmngr" -ErrorAction Ignore + +Write-Output "MSYS2 = $version" >> ~\versions.txt -- cgit v1.2.3 From 41abae43670a6e3eda07325fc7e40ba2ba3b07e6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Jul 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e4c1feae..0ce3f7d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4c1feae5c0bec21e24edbf5acacd248dd121634 +Subproject commit 0ce3f7d62b93427ca5d0f4284ba774691cbbd4a7 diff --git a/qtwebengine b/qtwebengine index 9dce1c5b..c3c37b4e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9dce1c5b12db094cdc469d7d68eb3124f9393dc7 +Subproject commit c3c37b4e93a26748497bec1a0dc29b8358408157 -- cgit v1.2.3 From 535dbcfe962199fb39aa02cd0f7a62a1e82bd8ea Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 16:29:10 +0300 Subject: Conan: Suppress output of New-Item MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d62fffa08d38a383187726e08743512236bb859 Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 0e9b9bc2..15a1aaca 100644 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 @@ -35,7 +35,7 @@ function Run-Conan-Install ForEach-Object { $conanfile = $_.FullName $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - New-Item $outpwd -Type directory -Force + New-Item $outpwd -Type directory -Force | Out-Null for ($i = 1; $i -le 5; $i++) { try { -- cgit v1.2.3 From 2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 18:38:32 +0300 Subject: Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/03-conan.ps1 | 60 ---------------------- coin/provisioning/common/windows/conan.ps1 | 60 ++++++++++++++++++++++ coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 2 +- .../qtci-windows-10-x86_64/03-conan.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 2 +- 5 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 coin/provisioning/common/windows/03-conan.ps1 create mode 100644 coin/provisioning/common/windows/conan.ps1 diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 deleted file mode 100644 index 15a1aaca..00000000 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ /dev/null @@ -1,60 +0,0 @@ -. "$PSScriptRoot\helpers.ps1" - -$scriptsPath = "C:\Python27\Scripts" - -Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0" - -# Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert" - -Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" - -function Run-Conan-Install -{ - Param ( - [string]$ConanfilesDir, - [string]$BuildinfoDir, - [string]$Arch, - [string]$Compiler, - [string]$CompilerVersion, - [string]$CompilerRuntime, - [string]$CompilerLibcxx - ) - - if ($CompilerRuntime) { - $extraArgs = "-s compiler.runtime=$($CompilerRuntime)" - } - - if ($CompilerLibcxx) { - $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" - } - - $manifestsDir = "$PSScriptRoot\conan_manifests" - - Get-ChildItem -Path "$ConanfilesDir\*.txt" | - ForEach-Object { - $conanfile = $_.FullName - $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - New-Item $outpwd -Type directory -Force | Out-Null - - for ($i = 1; $i -le 5; $i++) { - try { - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } - - Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" - } -} - -Write-Output "Conan = 0.24.0" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 new file mode 100644 index 00000000..15a1aaca --- /dev/null +++ b/coin/provisioning/common/windows/conan.ps1 @@ -0,0 +1,60 @@ +. "$PSScriptRoot\helpers.ps1" + +$scriptsPath = "C:\Python27\Scripts" + +Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0" + +# Use Qt Project repository by default +Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert" + +Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" + +function Run-Conan-Install +{ + Param ( + [string]$ConanfilesDir, + [string]$BuildinfoDir, + [string]$Arch, + [string]$Compiler, + [string]$CompilerVersion, + [string]$CompilerRuntime, + [string]$CompilerLibcxx + ) + + if ($CompilerRuntime) { + $extraArgs = "-s compiler.runtime=$($CompilerRuntime)" + } + + if ($CompilerLibcxx) { + $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" + } + + $manifestsDir = "$PSScriptRoot\conan_manifests" + + Get-ChildItem -Path "$ConanfilesDir\*.txt" | + ForEach-Object { + $conanfile = $_.FullName + $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + New-Item $outpwd -Type directory -Force | Out-Null + + for ($i = 1; $i -le 5; $i++) { + try { + Push-Location $outpwd + Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" + break; + } catch { + if ($i -eq 5) { + throw "Could not install conan content" + } + } finally { + Pop-Location + } + } + + Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" + } +} + +Write-Output "Conan = 0.24.0" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 75c6a232..d33ceea8 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index c2068666..40131a81 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 index 807e5480..4aa9658d 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` -- cgit v1.2.3 From 4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 02:50:02 +0300 Subject: Provisioning: Add CompilerException and CompilerThreads settings for Conan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80 Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/conan.ps1 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 15a1aaca..d440804e 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -18,15 +18,25 @@ function Run-Conan-Install [string]$Compiler, [string]$CompilerVersion, [string]$CompilerRuntime, - [string]$CompilerLibcxx + [string]$CompilerLibcxx, + [string]$CompilerException, + [string]$CompilerThreads ) if ($CompilerRuntime) { - $extraArgs = "-s compiler.runtime=$($CompilerRuntime)" + $extraArgs += " -s compiler.runtime=$CompilerRuntime" } if ($CompilerLibcxx) { - $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" + $extraArgs += " -s compiler.libcxx=$CompilerLibcxx" + } + + if ($CompilerException) { + $extraArgs += " -s compiler.exception=$CompilerException" + } + + if ($CompilerThreads) { + $extraArgs += " -s compiler.threads=$CompilerThreads" } $manifestsDir = "$PSScriptRoot\conan_manifests" -- cgit v1.2.3 From 716640a4770c8e11ab5f6e6ebb8db64868c2679b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 26 Jul 2019 18:57:59 +0300 Subject: Provisioning: update Conan and Conan packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/conan.ps1 | 50 +++- .../57.1/annulen/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 257 ----------------- .../59.1/vitallium/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 187 ------------ .../conanmanifest.txt | 187 ------------ .../conanmanifest.txt | 187 ------------ .../conanmanifest.txt | 187 ------------ .../64.2/qtproject/stable/export/conanmanifest.txt | 4 + .../conanmanifest.txt | 251 ++++++++++++++++ .../conanmanifest.txt | 251 ++++++++++++++++ .../conanmanifest.txt | 251 ++++++++++++++++ .../conanmanifest.txt | 251 ++++++++++++++++ .../conanmanifest.txt | 251 ++++++++++++++++ .../conanmanifest.txt | 251 ++++++++++++++++ .../qtproject/stable/export/conanmanifest.txt | 4 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../2.9.4/annulen/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 320 --------------------- .../vitallium/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 55 ---- .../conanmanifest.txt | 55 ---- .../conanmanifest.txt | 55 ---- .../conanmanifest.txt | 55 ---- .../qtproject/stable/export/conanmanifest.txt | 4 + .../conanmanifest.txt | 57 ++++ .../conanmanifest.txt | 274 ++++++++++++++++++ .../conanmanifest.txt | 57 ++++ .../conanmanifest.txt | 274 ++++++++++++++++++ .../conanmanifest.txt | 57 ++++ .../conanmanifest.txt | 57 ++++ .../1.1.29/annulen/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 136 --------- .../vitallium/stable/export/conanmanifest.txt | 2 - .../conanmanifest.txt | 38 --- .../conanmanifest.txt | 38 --- .../conanmanifest.txt | 38 --- .../conanmanifest.txt | 38 --- .../qtproject/stable/export/conanmanifest.txt | 3 + .../conanmanifest.txt | 39 +++ .../conanmanifest.txt | 39 +++ .../conanmanifest.txt | 39 +++ .../conanmanifest.txt | 131 +++++++++ .../conanmanifest.txt | 131 +++++++++ .../conanmanifest.txt | 39 +++ .../qtproject/stable/export/conanmanifest.txt | 7 + .../conanmanifest.txt | 9 + .../1.2.8/annulen/stable/export/conanmanifest.txt | 4 - .../conanmanifest.txt | 56 ---- coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 17 -- coin/provisioning/qtci-windows-10-x86/11-conan.ps1 | 17 ++ .../qtci-windows-10-x86/conanfiles/qtwebkit.txt | 21 +- .../qtci-windows-10-x86_64/03-conan.ps1 | 33 --- .../qtci-windows-10-x86_64/11-conan.ps1 | 53 ++++ .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 23 +- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 9 - coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | 11 + .../qtci-windows-7-x86/conanfiles/qtwebkit.txt | 24 +- 63 files changed, 2975 insertions(+), 1991 deletions(-) delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/04159420740fe51b1a5d12efd6a3342553fee413/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/0fa8894ab40ba8bc84e36b1278e6fb93534ef433/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/11dc74683b2b5768b63ea1e7443e7aaa2d3151c4/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/8f5896a40336524af740600c29144c7c6a773119/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a75971da93722f430ab0d3354b4c35c8e1cb8be6/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a779998d6f2f83fe0e000f516f7f7c4a1739e0a3/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/0576a44cadaf801a35075ee2885891b12616dbb9/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/228fe6274aa7b6b50620b9e88bd3505648dacfd9/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/4370064884cce35fe631d04efb5ff5c356ea732a/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/61072772572f3007a94ff98e7a5b24691e94f83f/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/a2f0cba83ce6faca8664d5e4c043b89cb0b7bfe2/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/c837186703e4fb24344e99222c6f8da4a8574e49/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt delete mode 100644 coin/provisioning/qtci-windows-10-x86/03-conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/11-conan.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/03-conan.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/11-conan.ps1 diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index d440804e..d77d28e2 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -1,11 +1,46 @@ +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2019 Konstantin Tokarev +## 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" -$scriptsPath = "C:\Python27\Scripts" +$scriptsPath = "C:\Python36\Scripts" -Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0" +Run-Executable "$scriptsPath\pip3.exe" "install --upgrade conan==1.17.0" +Write-Output "Conan = 1.17.0" >> ~\versions.txt # Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert" +Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" @@ -40,19 +75,20 @@ function Run-Conan-Install } $manifestsDir = "$PSScriptRoot\conan_manifests" + $buildinfoRoot = "C:\Utils\conanbuildinfos" Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName - $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" New-Item $outpwd -Type directory -Force | Out-Null for ($i = 1; $i -le 5; $i++) { try { Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", ` + Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" break; } catch { if ($i -eq 5) { @@ -66,5 +102,3 @@ function Run-Conan-Install Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" } } - -Write-Output "Conan = 0.24.0" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index c61454b9..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1478728220 -conanfile.py: 966eefe972ce7b809cf46722ed4acc8f \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt deleted file mode 100644 index ada3d009..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt +++ /dev/null @@ -1,257 +0,0 @@ -1478728553 -bin/derb.exe: 3ec3b316ff23272a1b3fd2b158bf8f0c -bin/genbrk.exe: d20b4453d8f27575aa99a922b1b73979 -bin/genccode.exe: fd6c6b4a19785fe79e64a5a7c42126f5 -bin/gencfu.exe: b5eb4c1573c0a57177d9b07c3f550fe5 -bin/gencmn.exe: 67af9d71860826f5b2fc77f88f05dd57 -bin/gencnval.exe: e249044782f01701e32e31479404b424 -bin/gendict.exe: 8602eabdc50fa6155b625726864dba16 -bin/gennorm2.exe: 325e3fdd8e7136e76c11f9b906051cd4 -bin/genrb.exe: 239a4ff2f0b48080aacb71fc76be8d2f -bin/gensprep.exe: a1c66a70887166b100cc41a5e46345ce -bin/icu-config: 96b18a047b3d3f489e2960b45896f816 -bin/icuinfo.exe: edd6e3cae4a64effa44d0f0c6d9c49e3 -bin/icupkg.exe: 3d8237194aab07ae0b94df5a612d9809 -bin/makeconv.exe: 99a4faca3677d2387af16a646a58ef8a -bin/pkgdata.exe: cc98c16f44eee8bbbe395b440ea4ffdf -bin/uconv.exe: d61219c6e2b6204bc6b763b19863ed36 -conaninfo.txt: fd101264bb948df865b27622957a2f15 -include/layout/LEFontInstance.h: 832355f57af5c308176c31b4b509ee66 -include/layout/LEGlyphFilter.h: d9f85ffb6092f4d0a0f7d6d2b47af762 -include/layout/LEGlyphStorage.h: f1223e9ee45c7b70bb5716523b110c53 -include/layout/LEInsertionList.h: dee4db6d6404cdb502188ef0f7271cf7 -include/layout/LELanguages.h: a067c055ed8b2463797e2219d5c4f584 -include/layout/LEScripts.h: 54a3a278a6e40180944ae915b816f4eb -include/layout/LESwaps.h: 75f4e8675dbe6af58e563834aedd7bc8 -include/layout/LETableReference.h: 5a398e838e744826c08b2c3246bb6c85 -include/layout/LETypes.h: e6b0751d998bf62a0f5c547ea385e01b -include/layout/LayoutEngine.h: 316ad98ce1ec2fbcff405706827efbc4 -include/layout/ParagraphLayout.h: 50ea2c0f4d5f43f8c889c9634628407a -include/layout/RunArrays.h: 3f617f033219e611639c272cb3aff784 -include/layout/loengine.h: f8b15a37f9c330dfa87c69c5501e80cd -include/layout/playout.h: e86c74c388011a1af118c1d4a53dde54 -include/layout/plruns.h: 84d32229ac7a487f0f9d34426fa3ea8a -include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9 -include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b -include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a -include/unicode/brkiter.h: 0a5796a84c272600a360dc5918899492 -include/unicode/bytestream.h: f828cc9f542c232d2aadb09b9099c559 -include/unicode/bytestrie.h: 765c037e45325e1970e839349df7c28c -include/unicode/bytestriebuilder.h: 634c9203ef678ee0d8fd9baffa8e3e46 -include/unicode/calendar.h: e360220586bcd0c3ea93b610bf4fe202 -include/unicode/caniter.h: f6de1e31cdc53563f35b093f8f8a07d8 -include/unicode/chariter.h: d6030b3dffd5355f9377318f76dd69de -include/unicode/choicfmt.h: e86083f42af655ca0806ce1ed3dc55a0 -include/unicode/coleitr.h: 9a393483da6d9daae0bf18dd997abcfa -include/unicode/coll.h: 06d3855e97984cd27579ec69b1985cc1 -include/unicode/compactdecimalformat.h: d1cca4ce6027a3d42a29b55e9ce0b82c -include/unicode/curramt.h: efd2919661fe8dbc23f6b0f5bd33e685 -include/unicode/currpinf.h: b3cf75cd234ec080a7fee08e20906be6 -include/unicode/currunit.h: f8b67c06aa5547b9911378f39e70bc5d -include/unicode/datefmt.h: 034fcd313ba7753923be9b30833ff13e -include/unicode/dbbi.h: 3435ff244bdf7d248fa81c8162f6da9c -include/unicode/dcfmtsym.h: e4935f31b8f97b149fa686a9996f6758 -include/unicode/decimfmt.h: e4fcfcfcb4bb45e7935cec1ec41ba359 -include/unicode/docmain.h: 81c20148681a5d7598d33fe1e49f3c5b -include/unicode/dtfmtsym.h: 4a7ee444945513d0939376634f42d0ec -include/unicode/dtintrv.h: 9d0929775a3d4599f90020ffb304d66c -include/unicode/dtitvfmt.h: d42ce527e4a5eb3138782d92acd97b88 -include/unicode/dtitvinf.h: c7cedf40b871f6d3c77cc013d06983f7 -include/unicode/dtptngen.h: b7e58f01d5e588371e22e55a2d255208 -include/unicode/dtrule.h: 9b687ce82b426bfd8b67f2a743f9114c -include/unicode/enumset.h: 9b15421cfac73c8845562dc2eba0f2e9 -include/unicode/errorcode.h: 28c37140645dfa2f430cf531131a2cbb -include/unicode/fieldpos.h: ae206bb308885c2dae6bd15792512e6f -include/unicode/filteredbrk.h: 3d230ab55f28d50fbc5c7d391cd897d9 -include/unicode/fmtable.h: fe37b4f3f1862172fcf708a8913b5d90 -include/unicode/format.h: 637778c5df6458f3f90d6f87e7d6a694 -include/unicode/fpositer.h: 276908f795beea88cd9d3f6f43ff82b2 -include/unicode/gender.h: 05bdc8c839f568e55c1d5d57c034dd36 -include/unicode/gregocal.h: 165eb6c7ffe6d914240c4bc0a2d7e5e0 -include/unicode/icudataver.h: 6b463f7d991d4cf4b0278bda90d4419f -include/unicode/icuplug.h: 2688326bbc6184edbfb04a9e398a363a -include/unicode/idna.h: b7885800ec0092f7b0411810ef0a0150 -include/unicode/listformatter.h: 8e460de80d6cb5701b3fcc2a3e704c14 -include/unicode/localpointer.h: ef6f8ec1d09bcfd660632f2df08c8d30 -include/unicode/locdspnm.h: df688f9f85fa7927b037811db0a5a934 -include/unicode/locid.h: 7d2c34577acdb5d7372ab35b02068581 -include/unicode/measfmt.h: fdd0cbd2a7f3af228f25560a3f63c4ad -include/unicode/measunit.h: 54bcc9c8bd45f4d61baad1ecfda8874d -include/unicode/measure.h: 3a03dc0bc233874de9b869a64a057835 -include/unicode/messagepattern.h: e3ae4457660d55835e42d88c3338a661 -include/unicode/msgfmt.h: de76868b18a099b367a685c31c0a14d8 -include/unicode/normalizer2.h: 0b96e4e3fe2db9df3ea140dbbe8ea140 -include/unicode/normlzr.h: 850f123dce4120db36601bcd4a77e925 -include/unicode/numfmt.h: c45e7b584738ae545937b3431a7e97b7 -include/unicode/numsys.h: 3b40734e737a0328f7c63124f07727e4 -include/unicode/parseerr.h: aa97d4d0cb5ef66baf1652c46223a81f -include/unicode/parsepos.h: 408632c4f4a0ec42811b50295be88ec9 -include/unicode/platform.h: fceecfa20a56af2a62a310d3d9fd1b14 -include/unicode/plurfmt.h: 06a5b724a0cdc04673d2467002605b50 -include/unicode/plurrule.h: 19d8e5c3f59ac4a833883da7fc52279c -include/unicode/ptypes.h: 93226b56866b0001f58f0319e430da08 -include/unicode/putil.h: 12979acdf705cac063a0f7862a20907b -include/unicode/rbbi.h: f0fe0af5306ea31bcb128a57dad17785 -include/unicode/rbnf.h: fa3ee91ae518f46628171c5eda544702 -include/unicode/rbtz.h: 76eb867d186e64e6bd425561d9371d7d -include/unicode/regex.h: 3ef7c102b12d3167fa019d203f524ec4 -include/unicode/region.h: 149a3b19b81a6e9093cb40f63a688fe7 -include/unicode/reldatefmt.h: 0f38d6b83c8a59898e4b546bd00bb459 -include/unicode/rep.h: 5fa4336c1302e276e81d2716a9789511 -include/unicode/resbund.h: 8c9bf16c940d2fa6d27e92b4b9023b1c -include/unicode/schriter.h: fcb1bcf67285e897acf621e937b13010 -include/unicode/scientificnumberformatter.h: 0f0c586dcb3cb2d59c10f9a42490e81f -include/unicode/search.h: ddfee95357399f1840854929715a99f3 -include/unicode/selfmt.h: cf18d9ce0e01636d74c14aac25dea995 -include/unicode/simpleformatter.h: aa8128e6a7368689e974552143be3c55 -include/unicode/simpletz.h: 0c847bdd492d23c7d78993e03d8364b8 -include/unicode/smpdtfmt.h: 19192d367d28f9812c71588222331218 -include/unicode/sortkey.h: 323299d4a40734274de910e74e6b7714 -include/unicode/std_string.h: e019f8e200de712588502817a22e5049 -include/unicode/strenum.h: cece8736aaa78de5edb80b2d8bcf2339 -include/unicode/stringpiece.h: 707434771237dbc6467f49aebc26f7f7 -include/unicode/stringtriebuilder.h: 251396f1c130290458da7553cca598f6 -include/unicode/stsearch.h: 70a69561b21c1a8e14f7d1a4e0760392 -include/unicode/symtable.h: dd632a7e27832b5992d4a54205c599c4 -include/unicode/tblcoll.h: 95b69fba4fd024406b9e4d991f1ad7c7 -include/unicode/timezone.h: 3e88d71098f36369b9892baff81c603c -include/unicode/tmunit.h: b946f43e7c8bec8aa50ddd6120671446 -include/unicode/tmutamt.h: e67a0e5e8b642aee17578411d554bcc2 -include/unicode/tmutfmt.h: 9d7e425317331c3ed890cefb0f654004 -include/unicode/translit.h: 9eb1419219ba781ff4653b4983a4e33c -include/unicode/tzfmt.h: 31ad89c49cc59da450befd0a9c2cee84 -include/unicode/tznames.h: 72003f95cbf6b2bb6acc12d3b4b3f41a -include/unicode/tzrule.h: 6416905b7247c15c939cc0e2d32a6510 -include/unicode/tztrans.h: 223b5af929e494c1894c6a24e8685f44 -include/unicode/ubidi.h: 66179ab0b99a5d356dba19e14eb5ecd3 -include/unicode/ubrk.h: 117eb54e39da5ce3dba2c9679707b0b7 -include/unicode/ucal.h: 70b7c32899132549a87577d2e96d8b75 -include/unicode/ucasemap.h: 1f64f081f3d1ee03e17d9cebb4b39c34 -include/unicode/ucat.h: 7420c409443c281d0396a824f7ce954c -include/unicode/uchar.h: 6049da45cae06c38009809cd701e8fc8 -include/unicode/ucharstrie.h: cdd315664d45ceeb931f740427eba956 -include/unicode/ucharstriebuilder.h: 08b57db9db7ec6c83a727b4e7e93a84c -include/unicode/uchriter.h: 26aecb73ed6c3b66d45920b6edc82e94 -include/unicode/uclean.h: 220a7ed9637f6d08844892406ee12fd7 -include/unicode/ucnv.h: 90e6635683216cf04e9e51c7793cce02 -include/unicode/ucnv_cb.h: 29d1534d54197074136641f9e73bca3a -include/unicode/ucnv_err.h: 0b8f3b01f733daf5fa2bab7d0c77a83f -include/unicode/ucnvsel.h: af61d762e6c51d92c6191a6234eba4c0 -include/unicode/ucol.h: 5794231873c0168366cac78abd7b9ba8 -include/unicode/ucoleitr.h: 2960fa61e49001636797afbc1cbd3e61 -include/unicode/uconfig.h: 2bc6d6073763aa34555775d5868dec4e -include/unicode/ucsdet.h: 77f79ed197997607ad82834cddcecee3 -include/unicode/ucurr.h: 4e010cfe5251e583c06597df3dbbd7c8 -include/unicode/udat.h: 03876d47a6da7ae776311f580635c003 -include/unicode/udata.h: ca1f4a55a240ea9586f2cca1ea4764c8 -include/unicode/udateintervalformat.h: 6f55cc14a063de8c79b74a7316d93e6f -include/unicode/udatpg.h: fd44f3f982452c68cdf6b1f3b159f068 -include/unicode/udisplaycontext.h: cdd37d6941337b96a75801e0716ca045 -include/unicode/uenum.h: 0f39322455d626debaf0bbe476a77c54 -include/unicode/ufieldpositer.h: 68ae4017d10f71b84083c24b2e09b536 -include/unicode/uformattable.h: 257f1dd17c788b7f5eab9ee3627f654c -include/unicode/ugender.h: be7155c7b25e2a7b7ea4d22ffc939557 -include/unicode/uidna.h: 851038bc78b135bf99c65dd0648e78f7 -include/unicode/uiter.h: 8e6b6197795cb2d42f8c80922d28ccf2 -include/unicode/uldnames.h: 8545429414195c42ee9a05694540bd8d -include/unicode/ulistformatter.h: 56cc2f8025387fcb18422300373a6e47 -include/unicode/uloc.h: b048d6c8e26ed8a65d0403d90ea4081c -include/unicode/ulocdata.h: 0803ed6ac97fbf4a10c3ca436f903fb2 -include/unicode/umachine.h: 8946d5b383646c9de9fc8c84eb0456fd -include/unicode/umisc.h: 3f34c9d536fdd5d4fddca2cf952bcfaa -include/unicode/umsg.h: 8880b14654d63c6e78a50d8f569b2766 -include/unicode/unifilt.h: 3b0368ea2da9a503aa47803e395b513e -include/unicode/unifunct.h: 3d37601bd3ae27b4e51431713d9f7533 -include/unicode/unimatch.h: e1a18096e0c7c7220c5c9149cd2d184c -include/unicode/unirepl.h: 7f1973a960a652ff74fa63e21969bab9 -include/unicode/uniset.h: fa3cfc8b4883a69120bf35e65f5d75ec -include/unicode/unistr.h: 975e37994ae2d3197a86284f1bdacdf3 -include/unicode/unorm.h: a04a23023daa99571ef2b7edca9dc6d2 -include/unicode/unorm2.h: 5ab66d75a9251a8df00f2075128ab010 -include/unicode/unum.h: 6e24b3d63e65f4d0a3076d33708a96d7 -include/unicode/unumsys.h: d239b6c2f97f51c221fcd66865adbaf9 -include/unicode/uobject.h: 07ebe875a9d304f71f525d2a71b20ddc -include/unicode/upluralrules.h: d9a66886a7585743cc8abe54af8e5955 -include/unicode/uregex.h: 6eb3c76e7d6fa2fed34b77f7fcc5cc85 -include/unicode/uregion.h: 0819c20dc8e0b5aebc5ec527828f565e -include/unicode/ureldatefmt.h: 057a6220b33c1c81e0cebc9a5da40929 -include/unicode/urename.h: 73c3a4cd707c1549f27341c859b099bb -include/unicode/urep.h: dc3eaf59ed5c198facce9f4a97a79ecf -include/unicode/ures.h: 6b374e2d473dfab51bcf7306c46f9eb6 -include/unicode/uscript.h: baaefbb5a6c5e251da2bb1800626d9e4 -include/unicode/usearch.h: 3e51b12fdf6a1adfc4696946ac0a4b6c -include/unicode/uset.h: 62d5813111f8391b4f616da08802aa24 -include/unicode/usetiter.h: 6baeb6276d80be18739355f9549b38e7 -include/unicode/ushape.h: f87732f736df2bbb90d46a10779876e7 -include/unicode/uspoof.h: a6510014653e0576fcf39c9dfd74f955 -include/unicode/usprep.h: 4ea1ec6a6d4fcbf2c1a239f23873da98 -include/unicode/ustdio.h: 0fd603db4b22ee783b7298e61be990b8 -include/unicode/ustream.h: 7d0c8f8409f683d2b1044537db4be8bf -include/unicode/ustring.h: 49c56a6248a7c92ee93a11331d2a6364 -include/unicode/ustringtrie.h: 08470063002ce9a8df978481b0d5588d -include/unicode/utext.h: c83e4d6390b463b28168cf90a734966e -include/unicode/utf.h: 0d1807bea996ca42bad86a938ba69453 -include/unicode/utf16.h: b376232af20fa9f77c983c6cc91800cf -include/unicode/utf32.h: ed15f0927cec48cab1922d08e1fdcce1 -include/unicode/utf8.h: 0d3fb609e35e2c67dce1a4889973bebd -include/unicode/utf_old.h: fce92682d7539e0fde301c54ef9e8760 -include/unicode/utmscale.h: 267dcde091ed1b81f03b1fff49c05e69 -include/unicode/utrace.h: 25f64a4cd8fc8a13bdfadd59bb287d49 -include/unicode/utrans.h: cc28e262a704403f38c26becae727165 -include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4 -include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1 -include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6 -include/unicode/vtzone.h: 90e065183436be0a94918465f66be863 -lib/icu/57.1/Makefile.inc: 51df1179cc12274af810405a09627a85 -lib/icu/57.1/pkgdata.inc: ea5b004208a38d31072631debf2820c5 -lib/icu/Makefile.inc: 51df1179cc12274af810405a09627a85 -lib/icu/current/Makefile.inc: 51df1179cc12274af810405a09627a85 -lib/icu/current/pkgdata.inc: ea5b004208a38d31072631debf2820c5 -lib/icu/pkgdata.inc: ea5b004208a38d31072631debf2820c5 -lib/icudt.dll: 008d9b3a7b34c3cfcf90b3314a998db9 -lib/icudt57.dll: 008d9b3a7b34c3cfcf90b3314a998db9 -lib/icuin.dll: 2dad9816f0d70e640435604dea7a02ca -lib/icuin57.dll: 2dad9816f0d70e640435604dea7a02ca -lib/icuio.dll: 5d8d3f8556adf2c4c1508dc7fd30c9d5 -lib/icuio57.dll: 5d8d3f8556adf2c4c1508dc7fd30c9d5 -lib/icule.dll: 7711d0ed1ab71d54a13d6146a44100a0 -lib/icule57.dll: 7711d0ed1ab71d54a13d6146a44100a0 -lib/iculx.dll: 8f9829ecc0917da35df6ac1b95867ea8 -lib/iculx57.dll: 8f9829ecc0917da35df6ac1b95867ea8 -lib/icutest.dll: c58029e6799efbd6dd809665bc243661 -lib/icutest57.dll: c58029e6799efbd6dd809665bc243661 -lib/icutu.dll: 6f76dea90ce1d6e7651471dbb9c15e09 -lib/icutu57.dll: 6f76dea90ce1d6e7651471dbb9c15e09 -lib/icuuc.dll: 6d770a12bdeee63da045a1030abdbaa1 -lib/icuuc57.dll: 6d770a12bdeee63da045a1030abdbaa1 -lib/libicudt.dll.a: 2a9bd71e462b4b914efc91907d7928f1 -lib/libicuin.dll.a: 5cfe05e08eca003163f3e5765e5b4c58 -lib/libicuio.dll.a: 2bdacffc519030a8d4188f83fdc81fd1 -lib/libicule.dll.a: b1fb12fb94759dd8a38d5abfa6f4ad21 -lib/libiculx.dll.a: c15e32fd0a5f9239be1370e557e1050b -lib/libicutest.dll.a: 14cd311813f51ce75b0d0989372ed3d9 -lib/libicutu.dll.a: d3357b6836a2d24f1f9786efc195e3f1 -lib/libicuuc.dll.a: 09afc25669dd4526dfe794a8cf9428a3 -lib/pkgconfig/icu-i18n.pc: 92c5e21b66b1c1103f95f3f24aba8407 -lib/pkgconfig/icu-io.pc: 7202507898b19d39e47af89913d2e48b -lib/pkgconfig/icu-le.pc: aecca7de6d94cd8fcea30f61818c3436 -lib/pkgconfig/icu-lx.pc: e3b92f49261a56c6fa42999929e0b614 -lib/pkgconfig/icu-uc.pc: 3c15a1901d200540ea9737e69473f721 -share/icu/57.1/LICENSE: 787d3b37867445c1cdd6f6167bd0e347 -share/icu/57.1/config/mh-mingw: fba135252f1f3bf3c41d9601239b91d6 -share/icu/57.1/install-sh: 5afe8eb5573965dfb58378e4e46f3813 -share/icu/57.1/mkinstalldirs: 7484dc240ad83e9908bed6d968fda871 -share/man/man1/derb.1: dd6ef195449ac6d5b737f593da48c645 -share/man/man1/genbrk.1: d582931cc6be22153312b877dfa10bda -share/man/man1/gencfu.1: 122f19c9001531b553d26d0df3daf5ff -share/man/man1/gencnval.1: 8e91c767edcfa124b530839d6773b186 -share/man/man1/gendict.1: c5bf41dd6f865bc6efec54e308ed3e2b -share/man/man1/genrb.1: 0334a4504849157d50d1dfc088857b90 -share/man/man1/icu-config.1: 669e5783bf5465d9828a8bee9af55257 -share/man/man1/makeconv.1: 454b0e32760b4ceb61c8b3d2ee16e989 -share/man/man1/pkgdata.1: 715020d492a3550929754c1a0df2e39c -share/man/man1/uconv.1: 80d9754f424b0468e719cc6616ba669d -share/man/man8/genccode.8: 47e0d56719f899919197ed154699910b -share/man/man8/gencmn.8: 666145011f4bdf0bd47178a93c94b710 -share/man/man8/gensprep.8: 1362b0c31dfa738c82a50fe8b7bec4d1 -share/man/man8/icupkg.8: dc12cc909e8e17758fda0ce8d241eefa \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index b7d5c80b..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1499107210 -conanfile.py: 3efebe46ba6af17316bd4e2a6fffef0c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt deleted file mode 100644 index 888563eb..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt +++ /dev/null @@ -1,187 +0,0 @@ -1499107660 -bin/icudt59.dll: 2a60bfe06670d8605ae7fc97c4ec2db7 -bin/icuin59.dll: d0a46fdd146a1bd68dde8bcb6b019470 -bin/icuio59.dll: 1fb60d06bcb4a5811e503a679b28dd67 -bin/icutest59.dll: 71bd203b8b2b930ca35240937c0f5429 -bin/icutu59.dll: fb0e6e2ee5c12c4809007747fcc23ad4 -bin/icuuc59.dll: 405d599ca8b2fbf78e6efeda65fdfffb -conaninfo.txt: b0fbb0ff195375b137bed8cc0921caad -include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc -include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395 -include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2 -include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00 -include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2 -include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5 -include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3 -include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485 -include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2 -include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4 -include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c -include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03 -include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4 -include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a -include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50 -include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37 -include/unicode/curramt.h: 323107674df349a27d624663757447e4 -include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719 -include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0 -include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587 -include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820 -include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b -include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee -include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb -include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a -include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095 -include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512 -include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6 -include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e -include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6 -include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184 -include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab -include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d -include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1 -include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166 -include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117 -include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1 -include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf -include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b -include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac -include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128 -include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef -include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0 -include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd -include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8 -include/unicode/locid.h: 34733130bd4387fa544d6761034a0955 -include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4 -include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253 -include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49 -include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1 -include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814 -include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a -include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51 -include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7 -include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b -include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226 -include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b -include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e -include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e -include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac -include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e -include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465 -include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce -include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade -include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be -include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d -include/unicode/region.h: 9975298932902d63b823382424ecb04f -include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147 -include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0 -include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032 -include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8 -include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9 -include/unicode/search.h: 3a213657ab777b638423df43e775ead6 -include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7 -include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1 -include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a -include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414 -include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87 -include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924 -include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542 -include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9 -include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521 -include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303 -include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4 -include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579 -include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a -include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247 -include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4 -include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98 -include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7 -include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068 -include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091 -include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a -include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c -include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83 -include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93 -include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f -include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063 -include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0 -include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0 -include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40 -include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b -include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235 -include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3 -include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed -include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5 -include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f -include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168 -include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854 -include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7 -include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f -include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a -include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36 -include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81 -include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987 -include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e -include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9 -include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b -include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494 -include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74 -include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a -include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee -include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517 -include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27 -include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640 -include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476 -include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e -include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688 -include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c -include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a -include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3 -include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b -include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62 -include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa -include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584 -include/unicode/uniset.h: 501821f127cc093433327c44909a7575 -include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716 -include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31 -include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8 -include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2 -include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec -include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c -include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789 -include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff -include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04 -include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98 -include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4 -include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee -include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07 -include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8 -include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56 -include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a -include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6 -include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7 -include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7 -include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5 -include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef -include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361 -include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9 -include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec -include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b -include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd -include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5 -include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410 -include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12 -include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8 -include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f -include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760 -include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8 -include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d -include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa -include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7 -include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3 -lib/icudt.lib: abf4c53a45afe7fe2232b7461db1f39c -lib/icuin.lib: 469731f3bb6c6c483a42168a9afff5fc -lib/icuio.lib: 62eebc954d46dbf22cf7e838f8bf0292 -lib/icutest.lib: 2dfda9f30ee5cd92c8e9752f19f1311f -lib/icutu.lib: 2ddf814a788e2fb77a9d06f38142a3ce -lib/icuuc.lib: 140e4ca5bbf6f88f504a2fd4bfafdd1d diff --git a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt deleted file mode 100644 index 948bc2f1..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt +++ /dev/null @@ -1,187 +0,0 @@ -1499329586 -bin/icudt59.dll: c23a39dad5b1810d53b142a79dd8040e -bin/icuin59.dll: c6904963eefd97137dd301db55c28f52 -bin/icuio59.dll: bd28d124d21c1aff1b77de11ef952447 -bin/icutest59.dll: e59aadd25c91d6b21fbdca3f18c0f3c3 -bin/icutu59.dll: 2256b957799e3816cfaedc6871f0be90 -bin/icuuc59.dll: 9a9c7f35b1fa2f93e557710e89eede8a -conaninfo.txt: 830576b304c6027b1312b1ed5165bd4b -include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc -include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395 -include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2 -include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00 -include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2 -include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5 -include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3 -include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485 -include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2 -include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4 -include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c -include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03 -include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4 -include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a -include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50 -include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37 -include/unicode/curramt.h: 323107674df349a27d624663757447e4 -include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719 -include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0 -include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587 -include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820 -include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b -include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee -include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb -include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a -include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095 -include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512 -include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6 -include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e -include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6 -include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184 -include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab -include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d -include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1 -include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166 -include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117 -include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1 -include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf -include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b -include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac -include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128 -include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef -include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0 -include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd -include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8 -include/unicode/locid.h: 34733130bd4387fa544d6761034a0955 -include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4 -include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253 -include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49 -include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1 -include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814 -include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a -include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51 -include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7 -include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b -include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226 -include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b -include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e -include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e -include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac -include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e -include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465 -include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce -include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade -include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be -include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d -include/unicode/region.h: 9975298932902d63b823382424ecb04f -include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147 -include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0 -include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032 -include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8 -include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9 -include/unicode/search.h: 3a213657ab777b638423df43e775ead6 -include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7 -include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1 -include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a -include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414 -include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87 -include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924 -include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542 -include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9 -include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521 -include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303 -include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4 -include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579 -include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a -include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247 -include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4 -include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98 -include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7 -include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068 -include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091 -include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a -include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c -include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83 -include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93 -include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f -include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063 -include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0 -include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0 -include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40 -include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b -include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235 -include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3 -include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed -include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5 -include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f -include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168 -include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854 -include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7 -include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f -include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a -include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36 -include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81 -include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987 -include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e -include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9 -include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b -include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494 -include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74 -include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a -include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee -include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517 -include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27 -include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640 -include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476 -include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e -include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688 -include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c -include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a -include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3 -include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b -include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62 -include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa -include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584 -include/unicode/uniset.h: 501821f127cc093433327c44909a7575 -include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716 -include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31 -include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8 -include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2 -include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec -include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c -include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789 -include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff -include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04 -include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98 -include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4 -include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee -include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07 -include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8 -include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56 -include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a -include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6 -include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7 -include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7 -include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5 -include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef -include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361 -include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9 -include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec -include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b -include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd -include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5 -include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410 -include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12 -include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8 -include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f -include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760 -include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8 -include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d -include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa -include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7 -include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3 -lib/icudt.lib: 8521dc55a20637af8e7cae4453fdae92 -lib/icuin.lib: 0af113d81bab592d2b7c628476b0a715 -lib/icuio.lib: 6812ca214d913a3e0ea303ddf899ff71 -lib/icutest.lib: 1bd7477e81bf551abdd0e80412b85805 -lib/icutu.lib: a69d87281efd6ade323f7c449ded3bb4 -lib/icuuc.lib: 74d264685f3ac6b7df1333fcf486aa45 diff --git a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt deleted file mode 100644 index e9b0ee71..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt +++ /dev/null @@ -1,187 +0,0 @@ -1499105682 -bin/icudt59.dll: 6f7abc01bb1d3d9b4a077c27ec228984 -bin/icuin59.dll: 5db6329ab0e0201d72025de56fa9d6a4 -bin/icuio59.dll: 6d3032695a7c12d3cce58a887f2bc644 -bin/icutest59.dll: 425538ed08d6785902b1238e877bc623 -bin/icutu59.dll: 83e15197d0b59cf5500c0c93aa186748 -bin/icuuc59.dll: 1eb31fe82fca12998a9a37c4852e7272 -conaninfo.txt: ad06024880f91bf13cbd6b54c13cf611 -include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc -include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395 -include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2 -include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00 -include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2 -include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5 -include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3 -include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485 -include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2 -include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4 -include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c -include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03 -include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4 -include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a -include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50 -include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37 -include/unicode/curramt.h: 323107674df349a27d624663757447e4 -include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719 -include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0 -include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587 -include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820 -include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b -include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee -include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb -include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a -include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095 -include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512 -include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6 -include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e -include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6 -include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184 -include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab -include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d -include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1 -include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166 -include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117 -include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1 -include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf -include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b -include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac -include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128 -include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef -include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0 -include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd -include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8 -include/unicode/locid.h: 34733130bd4387fa544d6761034a0955 -include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4 -include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253 -include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49 -include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1 -include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814 -include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a -include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51 -include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7 -include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b -include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226 -include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b -include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e -include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e -include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac -include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e -include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465 -include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce -include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade -include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be -include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d -include/unicode/region.h: 9975298932902d63b823382424ecb04f -include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147 -include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0 -include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032 -include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8 -include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9 -include/unicode/search.h: 3a213657ab777b638423df43e775ead6 -include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7 -include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1 -include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a -include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414 -include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87 -include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924 -include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542 -include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9 -include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521 -include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303 -include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4 -include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579 -include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a -include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247 -include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4 -include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98 -include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7 -include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068 -include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091 -include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a -include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c -include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83 -include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93 -include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f -include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063 -include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0 -include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0 -include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40 -include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b -include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235 -include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3 -include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed -include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5 -include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f -include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168 -include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854 -include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7 -include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f -include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a -include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36 -include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81 -include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987 -include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e -include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9 -include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b -include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494 -include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74 -include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a -include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee -include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517 -include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27 -include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640 -include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476 -include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e -include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688 -include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c -include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a -include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3 -include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b -include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62 -include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa -include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584 -include/unicode/uniset.h: 501821f127cc093433327c44909a7575 -include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716 -include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31 -include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8 -include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2 -include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec -include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c -include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789 -include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff -include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04 -include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98 -include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4 -include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee -include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07 -include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8 -include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56 -include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a -include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6 -include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7 -include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7 -include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5 -include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef -include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361 -include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9 -include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec -include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b -include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd -include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5 -include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410 -include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12 -include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8 -include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f -include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760 -include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8 -include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d -include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa -include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7 -include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3 -lib/icudt.lib: 0ad4d2a27d484d1ee141a17582758564 -lib/icuin.lib: 31a061da58f007137f4216294f7147ef -lib/icuio.lib: 657f8b121afa93db8433e85c98b3a2bc -lib/icutest.lib: 6d943d87ddd5a627f0c6bad0f5e13724 -lib/icutu.lib: 853af1f403ea9521004a933e91f5b508 -lib/icuuc.lib: 1e7a3fc48a7db11b6cfc16d455a4952b diff --git a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt deleted file mode 100644 index 905c0750..00000000 --- a/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt +++ /dev/null @@ -1,187 +0,0 @@ -1499330414 -bin/icudt59.dll: f4f67e917d72982f4d38b95a4eebf789 -bin/icuin59.dll: 3aaa0a3bb318eb7da1732e2164c98624 -bin/icuio59.dll: eb2e025f5ebbc37da56a435727ddb27e -bin/icutest59.dll: 86aa2a9fd01d121b419e9bfc821c541d -bin/icutu59.dll: 740a6cf36312a3601813ffedb95548dc -bin/icuuc59.dll: 77ffdc48d26d21580cea392387896d9f -conaninfo.txt: 72e5f245a2656624132fba01b63171fd -include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc -include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395 -include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2 -include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00 -include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2 -include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5 -include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3 -include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485 -include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2 -include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4 -include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c -include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03 -include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4 -include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a -include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50 -include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37 -include/unicode/curramt.h: 323107674df349a27d624663757447e4 -include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719 -include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0 -include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587 -include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820 -include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b -include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee -include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb -include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a -include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095 -include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512 -include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6 -include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e -include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6 -include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184 -include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab -include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d -include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1 -include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166 -include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117 -include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1 -include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf -include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b -include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac -include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128 -include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef -include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0 -include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd -include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8 -include/unicode/locid.h: 34733130bd4387fa544d6761034a0955 -include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4 -include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253 -include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49 -include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1 -include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814 -include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a -include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51 -include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7 -include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b -include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226 -include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b -include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e -include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e -include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac -include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e -include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465 -include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce -include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade -include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be -include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d -include/unicode/region.h: 9975298932902d63b823382424ecb04f -include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147 -include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0 -include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032 -include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8 -include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9 -include/unicode/search.h: 3a213657ab777b638423df43e775ead6 -include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7 -include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1 -include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a -include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414 -include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87 -include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924 -include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542 -include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9 -include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521 -include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303 -include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4 -include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579 -include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a -include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247 -include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4 -include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98 -include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7 -include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068 -include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091 -include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a -include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c -include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83 -include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93 -include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f -include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063 -include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0 -include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0 -include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40 -include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b -include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235 -include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3 -include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed -include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5 -include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f -include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168 -include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854 -include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7 -include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f -include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a -include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36 -include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81 -include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987 -include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e -include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9 -include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b -include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494 -include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74 -include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a -include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee -include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517 -include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27 -include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640 -include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476 -include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e -include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688 -include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c -include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a -include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3 -include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b -include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62 -include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa -include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584 -include/unicode/uniset.h: 501821f127cc093433327c44909a7575 -include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716 -include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31 -include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8 -include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2 -include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec -include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c -include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789 -include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff -include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04 -include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98 -include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4 -include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee -include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07 -include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8 -include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56 -include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a -include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6 -include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7 -include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7 -include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5 -include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef -include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361 -include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9 -include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec -include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b -include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd -include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5 -include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410 -include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12 -include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8 -include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f -include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760 -include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8 -include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d -include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa -include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7 -include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3 -lib/icudt.lib: a4bc5fec27a13bc471b747e67ec58bc4 -lib/icuin.lib: 452cfb482c2b072f99489029a9bb789c -lib/icuio.lib: c9b9c1c8ef2f622825775a1fd10186c0 -lib/icutest.lib: 7408004f6b9d8318b10a631ed933353b -lib/icutu.lib: 820e5a0e98bcc257822f254f73c7c682 -lib/icuuc.lib: 62326159fad7b218f3f8455c32da970c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..0179c3cc --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,4 @@ +1563296922 +LICENSE.md: e5e131742c86307b7fb2fc2255e6277d +conanfile.py: 18b376bcd3b1fb69a62d916ee609ce75 +icu_base.py: 03540bb5bf8ac0694a52ee04566cef8a diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/04159420740fe51b1a5d12efd6a3342553fee413/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/04159420740fe51b1a5d12efd6a3342553fee413/conanmanifest.txt new file mode 100644 index 00000000..53ef2d23 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/04159420740fe51b1a5d12efd6a3342553fee413/conanmanifest.txt @@ -0,0 +1,251 @@ +1563302303 +bin/derb.exe: 5dab26f815c8a555677c48514a6208eb +bin/escapesrc.exe: 196361eaefbf657aaad12f6ebc7d9fd0 +bin/genbrk.exe: 481473c589c454cb0c67d477112326b6 +bin/genccode.exe: 36e12767557b6b62b7368b82af71dc7d +bin/gencfu.exe: 4ed7055fc629466383663481024ce56b +bin/gencmn.exe: 793b30b115e0d1697a005bbd7be8e2bf +bin/gencnval.exe: 549ae3eff6f7f6c733a7a022e74ccf16 +bin/gendict.exe: 38799ad1ecf2bac24995d2030b248b1a +bin/gennorm2.exe: 2b0ee309f4dd5f6394a799ae57615d99 +bin/genrb.exe: 0ad48828a13286a2ef10140a5b4a89df +bin/gensprep.exe: 8a8c1abb007b882616f0c038b473a4fa +bin/icu-config: 0bb77dfc59d545ffb13abbe29faa1050 +bin/icuinfo.exe: 06e182a0726c4fbdc0e2bad482cbcddb +bin/icupkg.exe: a1f1c12ec71f39a273cdba803329feec +bin/makeconv.exe: 12d9fa58c5016487606c60f2604dbfa5 +bin/pkgdata.exe: 47afb5e78953c34bd9bd3a47a8b58b1c +bin/uconv.exe: 1b3131e11a447981322d479ac418e152 +conaninfo.txt: 94f4cb59828b265621231d47fa4013f1 +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: 877c8d22d35ab71a25e3545b714b393e +lib/icu/64.2/pkgdata.inc: 49b14eabd895cebb63a73c80d9099337 +lib/icu/Makefile.inc: 877c8d22d35ab71a25e3545b714b393e +lib/icu/current/Makefile.inc: 877c8d22d35ab71a25e3545b714b393e +lib/icu/current/pkgdata.inc: 49b14eabd895cebb63a73c80d9099337 +lib/icu/pkgdata.inc: 49b14eabd895cebb63a73c80d9099337 +lib/icudt.dll: 51718083e11c934244a2180453b6192d +lib/icudt64.dll: d4b6d9f7726209fb2e7c50ad59ef948e +lib/icuin.dll: 37ef9947c0ed682d9ca1200599ef8326 +lib/icuin64.dll: 37ef9947c0ed682d9ca1200599ef8326 +lib/icuio.dll: 6f163cb40ada9784eef3ff17d7c81541 +lib/icuio64.dll: 6f163cb40ada9784eef3ff17d7c81541 +lib/icutest.dll: 22f051d821580c97afb4e98955502003 +lib/icutest64.dll: 22f051d821580c97afb4e98955502003 +lib/icutu.dll: a1d54e06d72aa4ff539c850dc8b5ef07 +lib/icutu64.dll: a1d54e06d72aa4ff539c850dc8b5ef07 +lib/icuuc.dll: 95f54a0d2f02015eb1a2d996d52f7379 +lib/icuuc64.dll: 95f54a0d2f02015eb1a2d996d52f7379 +lib/libicudt.dll.a: 1bee3188c02b6416f380d1317ddb6173 +lib/libicuin.dll.a: 45887066a9eec4f2a3babb6a2b149cca +lib/libicuio.dll.a: f28fc05d5c77873f77c98de4120c2257 +lib/libicutest.dll.a: e124c5752ed2fa61d3305d62c6bbb77f +lib/libicutu.dll.a: 613e72ca20a6a70dea011a863fdb67cf +lib/libicuuc.dll.a: c48739947c0ec41087df6f167b9f193d +lib/pkgconfig/icu-i18n.pc: 1f2b1e05e6f343591662ee6a5c2120ff +lib/pkgconfig/icu-io.pc: 90ce9fbc240c0d18469d4c949c1ff38c +lib/pkgconfig/icu-uc.pc: 59f15ab191724fc7a7bb257f96d1746e +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-mingw64: 21a2b87cfc116d4f2a08e9c6c160f2d4 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/0fa8894ab40ba8bc84e36b1278e6fb93534ef433/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/0fa8894ab40ba8bc84e36b1278e6fb93534ef433/conanmanifest.txt new file mode 100644 index 00000000..3246cfc4 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/0fa8894ab40ba8bc84e36b1278e6fb93534ef433/conanmanifest.txt @@ -0,0 +1,251 @@ +1563301699 +bin/derb.exe: 375bc0810269406e4097d43a9ef65de5 +bin/escapesrc.exe: 5569002ce7984123f9eefa19840a6ee7 +bin/genbrk.exe: 10c1ce5f94d9fac6b4d38429855483a5 +bin/genccode.exe: 79e308a8f027703438157b75cdcaee5f +bin/gencfu.exe: b3f38f0d3f048e988eae84ac462291e2 +bin/gencmn.exe: a1660bd03f65026d9557f7b8354d6a14 +bin/gencnval.exe: e04e852bd61714cfa38e795429d637e9 +bin/gendict.exe: 0fee346a8d0d07f1566501859da6d475 +bin/gennorm2.exe: 9e618d91189587ef232a399e4939ed59 +bin/genrb.exe: ee43e9ada1993a944aee14b5af361ec8 +bin/gensprep.exe: 24f03316091277e31f3d1e21d907c143 +bin/icu-config: 665a391274c974f9b3416bf3c796f9e8 +bin/icuinfo.exe: ba1e67402b55c3d5f3a494f326c7782f +bin/icupkg.exe: 2a326b48e8b86d69d02f79db5380f629 +bin/makeconv.exe: 9be102256933aab5d9396495bbe8aa43 +bin/pkgdata.exe: a9b1aac252e93d5aa4cdbdd85ba4e46e +bin/uconv.exe: 5dd0ea19fc070e08af7405cacadbbb01 +conaninfo.txt: 575afb295783470adb371557b8917a1a +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: d000546022e2d0cfb58241c11f054e80 +lib/icu/64.2/pkgdata.inc: 9e9ad5b73839668e9675f4b31caa2ebe +lib/icu/Makefile.inc: d000546022e2d0cfb58241c11f054e80 +lib/icu/current/Makefile.inc: d000546022e2d0cfb58241c11f054e80 +lib/icu/current/pkgdata.inc: 9e9ad5b73839668e9675f4b31caa2ebe +lib/icu/pkgdata.inc: 9e9ad5b73839668e9675f4b31caa2ebe +lib/icudt.dll: ac6efe7eaec4fa7b749550173b04392f +lib/icudt64.dll: 4d80d23284671bd24e8ac1aaf6fc0a7b +lib/icuin.dll: 0a482904d287f7c26d664be6ae1f1671 +lib/icuin64.dll: 0a482904d287f7c26d664be6ae1f1671 +lib/icuio.dll: ed81589b9b71286be32cd8bee437eb41 +lib/icuio64.dll: ed81589b9b71286be32cd8bee437eb41 +lib/icutest.dll: 3c6d6063ae6f1d621a79b7897b48d656 +lib/icutest64.dll: 3c6d6063ae6f1d621a79b7897b48d656 +lib/icutu.dll: 520c5a42e1c175b532fbcd9b90313b6c +lib/icutu64.dll: 520c5a42e1c175b532fbcd9b90313b6c +lib/icuuc.dll: 8200c94ba062e2c9e30da33aca8a4309 +lib/icuuc64.dll: 8200c94ba062e2c9e30da33aca8a4309 +lib/libicudt.dll.a: df32fc5d9b5b4b8b73ef99bd6406fc8e +lib/libicuin.dll.a: b46652d08d3f871395a17d1464c49971 +lib/libicuio.dll.a: 30bbc1bd1301eb888d4ec6097537662a +lib/libicutest.dll.a: 787604ab7a3c1de020d86a9a1fa66be3 +lib/libicutu.dll.a: a5373379a2587d545ab1dd45f0c0667b +lib/libicuuc.dll.a: 2a0ffc1076f58b463cc4bec245c2b1be +lib/pkgconfig/icu-i18n.pc: f573b14475965f49567ed83d5031538e +lib/pkgconfig/icu-io.pc: 2a4e41cb67a88fc54f60694bef22b72a +lib/pkgconfig/icu-uc.pc: 22a5ded4d9fe218e037b1f4c13a70579 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-mingw: ab13bce100d6595882f2b3a8cc69b564 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/11dc74683b2b5768b63ea1e7443e7aaa2d3151c4/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/11dc74683b2b5768b63ea1e7443e7aaa2d3151c4/conanmanifest.txt new file mode 100644 index 00000000..7762ff52 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/11dc74683b2b5768b63ea1e7443e7aaa2d3151c4/conanmanifest.txt @@ -0,0 +1,251 @@ +1563299277 +bin/derb.exe: 90f54a8bbda4f39f4c47287681cb5552 +bin/escapesrc.exe: 12accb206165830ccf4d69fa1f59fc1e +bin/genbrk.exe: 9cbe27e07ad58bf1d237c3349fffa504 +bin/genccode.exe: d84c895291b64a664556e5a1fe6f6bdf +bin/gencfu.exe: be92b3dfda1abb865169cdfb3ede6b4d +bin/gencmn.exe: dac536a66875e73d7d70f881ce89d06d +bin/gencnval.exe: aa1bd302568764a11b399e325e50e653 +bin/gendict.exe: 676c786297c610cf0f5c04599ea3dbe7 +bin/gennorm2.exe: 3c5bf8829fd165df210dcba3b7dc3707 +bin/genrb.exe: 8ae3ad0fda5d3b89f720d423351a5ab7 +bin/gensprep.exe: f5de9cef94d2140c495b63a064013c04 +bin/icu-config: 5b68566c6fde8a8f0c20d9510580f68b +bin/icuinfo.exe: e1141df949642693b26f9fddc43918c0 +bin/icupkg.exe: 8ef556e822f708e61e7c5bb6a1a3b32b +bin/makeconv.exe: ebe2fe9248d4a3a1e0070a2861e35f44 +bin/pkgdata.exe: 807bd1cff4a08161f8b9334e327db6f1 +bin/uconv.exe: 470f25326a8ad758f90f1e4a6f8f17b0 +conaninfo.txt: 9675d2fb92175cb1bef18e3e3ff74825 +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: 49a9042429df8bb20c35ae40a5e872bc +lib/icu/64.2/pkgdata.inc: 4baa6960303983040c0689566f358abd +lib/icu/Makefile.inc: 49a9042429df8bb20c35ae40a5e872bc +lib/icu/current/Makefile.inc: 49a9042429df8bb20c35ae40a5e872bc +lib/icu/current/pkgdata.inc: 4baa6960303983040c0689566f358abd +lib/icu/pkgdata.inc: 4baa6960303983040c0689566f358abd +lib/icudt.dll: a8748b83adb2628d2c99150894d8ac1b +lib/icudt.lib: 898e94917525b05795e4a30553f4b666 +lib/icudt64.dll: 4282a87a2c9daf500af6c5f7e9b4e109 +lib/icuin.dll: bff4742e2ba70223bf90373952a1eae7 +lib/icuin.lib: 3f9b2e9d2f305451f8b3915fba0f8403 +lib/icuin64.dll: bff4742e2ba70223bf90373952a1eae7 +lib/icuio.dll: d8d5998ed616f4a66073cfd37efc6caa +lib/icuio.lib: f501e4e1d43982349477e30de4429b9e +lib/icuio64.dll: d8d5998ed616f4a66073cfd37efc6caa +lib/icutest.dll: dfe962d20d861934b40901b50ad90e4b +lib/icutest.lib: 7bf6bdcade9592385d7c9daac9f2745a +lib/icutest64.dll: dfe962d20d861934b40901b50ad90e4b +lib/icutu.dll: 6b7a7fa8f00c563d41cd79928cae7884 +lib/icutu.lib: 942628ede719f1f9908fc7733fc5b437 +lib/icutu64.dll: 6b7a7fa8f00c563d41cd79928cae7884 +lib/icuuc.dll: 4b4ec90086dd45b272354d748cc4f86d +lib/icuuc.lib: 449908250aff19a211223e1f54a00546 +lib/icuuc64.dll: 4b4ec90086dd45b272354d748cc4f86d +lib/pkgconfig/icu-i18n.pc: 35a0ea632f5e2750c5b88b57c280185f +lib/pkgconfig/icu-io.pc: 460699d6c9195c15fe610407e7c94dc1 +lib/pkgconfig/icu-uc.pc: 571c9d5900880452353bed815fe9b556 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-msys-msvc: deb94ef2bd29c3471723b79091991a51 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/8f5896a40336524af740600c29144c7c6a773119/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/8f5896a40336524af740600c29144c7c6a773119/conanmanifest.txt new file mode 100644 index 00000000..e5259822 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/8f5896a40336524af740600c29144c7c6a773119/conanmanifest.txt @@ -0,0 +1,251 @@ +1563297339 +bin/derb.exe: 7cd652556ce507a28ae660230f10568b +bin/escapesrc.exe: 1edea3a9d8522e65e8053c9086eed770 +bin/genbrk.exe: 746dcc890f9723f73aa9f75dea374ce3 +bin/genccode.exe: dcbef1a4ea36678b9526aa87835675e1 +bin/gencfu.exe: cd19e1d4aed9b9aeb7d277daacb5986d +bin/gencmn.exe: 529ea65a5773bb35cde37cdbf9adb6dd +bin/gencnval.exe: 2e6d55a670224e6f0658229d84e6a6a5 +bin/gendict.exe: f8b5a0456d69e825d2c88061b31b9676 +bin/gennorm2.exe: 773d3a430f1b8311882753b65c7c6d71 +bin/genrb.exe: b5432bca364600228474909227413bbe +bin/gensprep.exe: bb9fc116557ab14439cbef3440054134 +bin/icu-config: 869e4451de3e58a28e317cf451c66ac3 +bin/icuinfo.exe: 4bfad340f094172a591d28ba43fdef38 +bin/icupkg.exe: dcaf4627585fb9c59605741f91586107 +bin/makeconv.exe: 6d3238b2b0f479b3c9bebb4bb2d46169 +bin/pkgdata.exe: 27ff75055a8338c77320f4cb9418bcf4 +bin/uconv.exe: 27fce36a4c62ecb72569b769e0349f24 +conaninfo.txt: 540bd8edc660c49d7a7fa5802d75e37a +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: 3fe76ee05bc5afaade899a09af565372 +lib/icu/64.2/pkgdata.inc: 438ae219a7c80279027ca5fd315183c3 +lib/icu/Makefile.inc: 3fe76ee05bc5afaade899a09af565372 +lib/icu/current/Makefile.inc: 3fe76ee05bc5afaade899a09af565372 +lib/icu/current/pkgdata.inc: 438ae219a7c80279027ca5fd315183c3 +lib/icu/pkgdata.inc: 438ae219a7c80279027ca5fd315183c3 +lib/icudt.dll: ce725647c92aca144492f3dbf3ee04ab +lib/icudt.lib: d4e6c59a65ceeea625b1c5d7e35f363c +lib/icudt64.dll: 6b2909c7301d61d84f5fd2286153a1b5 +lib/icuin.dll: 8f2c0c4ce91bcd934234802538d8df14 +lib/icuin.lib: d09d76c165eacaaf52f7320ce0640f55 +lib/icuin64.dll: 8f2c0c4ce91bcd934234802538d8df14 +lib/icuio.dll: ed47e8ce82dac037a9890e0267640627 +lib/icuio.lib: 2fd670029f2809911c8222baa6c56873 +lib/icuio64.dll: ed47e8ce82dac037a9890e0267640627 +lib/icutest.dll: 6b3bada7f63c1c864439ade06a7fd723 +lib/icutest.lib: 110add657fb11e29f12b0ca5b051dfde +lib/icutest64.dll: 6b3bada7f63c1c864439ade06a7fd723 +lib/icutu.dll: f18bca836cb96b59f007eb9ac5fd3e68 +lib/icutu.lib: 4d1c6e152525c0b834eeeb06c9196c6f +lib/icutu64.dll: f18bca836cb96b59f007eb9ac5fd3e68 +lib/icuuc.dll: 1dee2047ea3d480376375c7db457acb3 +lib/icuuc.lib: f669e924846cbe1dc144ee15f1094a66 +lib/icuuc64.dll: 1dee2047ea3d480376375c7db457acb3 +lib/pkgconfig/icu-i18n.pc: 75e0caa47aef4ee8dad62714518ce7e3 +lib/pkgconfig/icu-io.pc: bbb8e1ef1d9bf466c474ed4722ba1fe6 +lib/pkgconfig/icu-uc.pc: 5ef9d87af3f5aff6401d808db734f3bf +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-msys-msvc: deb94ef2bd29c3471723b79091991a51 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a75971da93722f430ab0d3354b4c35c8e1cb8be6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a75971da93722f430ab0d3354b4c35c8e1cb8be6/conanmanifest.txt new file mode 100644 index 00000000..eace1273 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a75971da93722f430ab0d3354b4c35c8e1cb8be6/conanmanifest.txt @@ -0,0 +1,251 @@ +1563298569 +bin/derb.exe: 7d155c681231f54f3669512100a3038b +bin/escapesrc.exe: 3a54768e31b5a9bf53d0a9fb7b061f10 +bin/genbrk.exe: 12e8b427719bfc85cb0e360422fd81e5 +bin/genccode.exe: 4396af32d01e2106690bd9be45806950 +bin/gencfu.exe: 59986571fd686f3318478d421a9fc9e8 +bin/gencmn.exe: 50750e744321b6a3bade411422e7200a +bin/gencnval.exe: b57f7999a023751638b310e850a875ce +bin/gendict.exe: c950331a93edec89eb962df7390f870d +bin/gennorm2.exe: 842415940c303beeb1716446f99a9d67 +bin/genrb.exe: 90cf94ed8ae02aa51e96f76ab92bfdea +bin/gensprep.exe: 004c1295706f785027f8dd977ba40f50 +bin/icu-config: a59cd8e08313ed02c280f1594f2e4bf1 +bin/icuinfo.exe: 08bb8fa2d591f6e8ee93db64f7ed2ec4 +bin/icupkg.exe: 5c165a685956ccd12a0d858cab69b20b +bin/makeconv.exe: 89487251963c62fe0c3dc00610e60f09 +bin/pkgdata.exe: 0704cd29d80d2d2e3155fdd989c9b94d +bin/uconv.exe: e1d74673fa12224f8371052f6f5feeb2 +conaninfo.txt: e159d49bd326a197124489ebd8636307 +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: 6c092462cc6db00d752a733b771de789 +lib/icu/64.2/pkgdata.inc: e0192327bcacf61fba9402f67377ab4a +lib/icu/Makefile.inc: 6c092462cc6db00d752a733b771de789 +lib/icu/current/Makefile.inc: 6c092462cc6db00d752a733b771de789 +lib/icu/current/pkgdata.inc: e0192327bcacf61fba9402f67377ab4a +lib/icu/pkgdata.inc: e0192327bcacf61fba9402f67377ab4a +lib/icudt.dll: 15709335a869f8f94cc8c6be6c67a3d7 +lib/icudt.lib: 6c28bff05a11ca4606ccdb90935307d8 +lib/icudt64.dll: f8a3a40930adfbd0da1863a3c345aff8 +lib/icuin.dll: 9a3c5dfa3855df6e1d0292a572274abb +lib/icuin.lib: 314b4206062131c02206389852decf97 +lib/icuin64.dll: 9a3c5dfa3855df6e1d0292a572274abb +lib/icuio.dll: ecf45606b8b48e38f13938e1bdc06252 +lib/icuio.lib: 68b6479455934321afd66a395f920fe1 +lib/icuio64.dll: ecf45606b8b48e38f13938e1bdc06252 +lib/icutest.dll: 31eb2b086911853280a3e52907e8cbae +lib/icutest.lib: cc54d80d0566a234ba8c33f25ea21a0e +lib/icutest64.dll: 31eb2b086911853280a3e52907e8cbae +lib/icutu.dll: 493b7e3e5f80811d7f15ce8695936db6 +lib/icutu.lib: 5e9f9225f1c5a767e636ad81f45fb854 +lib/icutu64.dll: 493b7e3e5f80811d7f15ce8695936db6 +lib/icuuc.dll: 16f1a404b6a12e105ef79b8c080dce93 +lib/icuuc.lib: c7cb6e9b49a9982322891656c9bf4ee8 +lib/icuuc64.dll: 16f1a404b6a12e105ef79b8c080dce93 +lib/pkgconfig/icu-i18n.pc: 563963d9f6cca93481456dc19e973958 +lib/pkgconfig/icu-io.pc: 838e3c4ffd237b5fe921cefea15fd327 +lib/pkgconfig/icu-uc.pc: ea0501759b296704a1e2319420dddb59 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-msys-msvc: deb94ef2bd29c3471723b79091991a51 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a779998d6f2f83fe0e000f516f7f7c4a1739e0a3/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a779998d6f2f83fe0e000f516f7f7c4a1739e0a3/conanmanifest.txt new file mode 100644 index 00000000..706f1e53 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/64.2/qtproject/stable/package/a779998d6f2f83fe0e000f516f7f7c4a1739e0a3/conanmanifest.txt @@ -0,0 +1,251 @@ +1563297860 +bin/derb.exe: 4007262865fcb9d6c7b7bfaadacc0b8e +bin/escapesrc.exe: 877b764cf7a705f0f0f0b81173078c01 +bin/genbrk.exe: 716cf45fb7e09ffe4f110480b6a28832 +bin/genccode.exe: 3b468fd77d7e5cf80ecbb4d32b4be7cb +bin/gencfu.exe: 95f0d7ff1f481f66726036b672076ba8 +bin/gencmn.exe: a03b4d4f9b94a8444a8d8a3c3f798bd6 +bin/gencnval.exe: 6750a9a5197fbd74b275b5fd7dd7c33e +bin/gendict.exe: b6f46c1edc548cbdd9ac67118a5d7c10 +bin/gennorm2.exe: e8cc3907125b3bc4c5e9ed448e3c2973 +bin/genrb.exe: d1a306e9480606f24b54149e2799dc2b +bin/gensprep.exe: 63036e1b8ddb3bad807d6c715eda172a +bin/icu-config: 9781767fcfa815c455e405cbcbb9145c +bin/icuinfo.exe: 74bc712f5696f58051aab155bc8dadfa +bin/icupkg.exe: 61c5bf5b56108646efc293a4655db32a +bin/makeconv.exe: e52c6aa01bb900e12a94af475aecd1c1 +bin/pkgdata.exe: 1ef1bfbf10da2177339157bf133b03d9 +bin/uconv.exe: c37a845021460f32e50e9674c13bbd95 +conaninfo.txt: ca8ff827ceed6bcfd8927596f342ccd3 +include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9 +include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f +include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f +include/unicode/brkiter.h: c69c05b804270ad6c64f80c03a5b8ee0 +include/unicode/bytestream.h: 8b946f79fb11d18859acdceab1bb5d46 +include/unicode/bytestrie.h: 781e30fb8103ba58fdfe4b6704e54347 +include/unicode/bytestriebuilder.h: e6649e470ceff3af7ec894aa6031cb21 +include/unicode/calendar.h: e640b0fd471a5313b85a866871b9df2a +include/unicode/caniter.h: 74858b2a33cb2805dea0b0bc480dda7d +include/unicode/casemap.h: b40e8878db23b64a72763bf75e4e3e2a +include/unicode/char16ptr.h: 3bed1c6f219d725f6daf274704427035 +include/unicode/chariter.h: 463cdd4748695660223db14c27da3e84 +include/unicode/choicfmt.h: 38f338fb58eebce7fc999c906aad142e +include/unicode/coleitr.h: 35cafcefbe5155408aa6166781d4290d +include/unicode/coll.h: a60e4d0e20f25015d370bfb3b24e267e +include/unicode/compactdecimalformat.h: dd1f639d5c836e200b48ad69ef326fc0 +include/unicode/curramt.h: 8f57c8f5a77ffd6d1f4a9c53b100ee3e +include/unicode/currpinf.h: e279f04f8bb9c6a686ede0f4bbc7caf4 +include/unicode/currunit.h: 0ea702494028296a411ac0bda6895275 +include/unicode/datefmt.h: 91aee102e3fa68c64113645be5b944c4 +include/unicode/dbbi.h: 15a312f4cf6c6bc243fd6d32368956a1 +include/unicode/dcfmtsym.h: 3eec16337aeaa8877e966616ac53783a +include/unicode/decimfmt.h: 18479b4ccc0b4efa7732b1da2d0fd2ab +include/unicode/docmain.h: 0df0e8161180b869031a88050e0a01c9 +include/unicode/dtfmtsym.h: c06710d48a792838da0f5e3814b3908a +include/unicode/dtintrv.h: 65e3985e944f54230322acc986c59a30 +include/unicode/dtitvfmt.h: 72a63051451b33ba43f67e572883e855 +include/unicode/dtitvinf.h: b6e798c244d5d4ed73916a8db5b4a855 +include/unicode/dtptngen.h: 5c7a7e4d10c3db7123815ff42dc904f6 +include/unicode/dtrule.h: a2a865734c97d4d5ee2a095ebbd629cf +include/unicode/edits.h: 7fd52de9a5c418c48234d1425f22fabc +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: 6f00859e026be521cff595db38b871db +include/unicode/fieldpos.h: d42ab3ff641fdc7016cbc3e7526594a1 +include/unicode/filteredbrk.h: 4ab1ef82654177aea8000c72f6652e40 +include/unicode/fmtable.h: c0c5ea7bd3e3a5fded75c2fea543c668 +include/unicode/format.h: 71642e006d9e359a5a8b0800d390ec52 +include/unicode/formattedvalue.h: a502788adec3ba1025321c2cefd0e4c7 +include/unicode/fpositer.h: 2fdf3d1fa8b84e6ba3c561803de5f595 +include/unicode/gender.h: 21d668158f52ab989a8a4711de79f099 +include/unicode/gregocal.h: 4e746c8c84966372f9e66255e3d05246 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: e2bb1287f5f61b37dd11493008d29ef6 +include/unicode/listformatter.h: 2942dcd998fbadca9043912a2dbe9e7e +include/unicode/localebuilder.h: 5690e3f03681a2fbfe7baea5226378cd +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: 5d12af057d2675b88cf95dc63f015f21 +include/unicode/locid.h: 9df99f05fc348684e116098f6e0a6710 +include/unicode/measfmt.h: 909302945254ede1a345342a8c4b402d +include/unicode/measunit.h: 9e0fe1ba857f051874760f7aad55c68b +include/unicode/measure.h: 060550ced6b6ceae742c8d47772e190f +include/unicode/messagepattern.h: b671e9e96bad09137a7bf186e8d795fc +include/unicode/msgfmt.h: f1723a391f733367dde795d42d1734f3 +include/unicode/normalizer2.h: 909305633321f6cbb76cc88dc8c00c90 +include/unicode/normlzr.h: c974010d56584fcf75f0f2e10e05fe9c +include/unicode/nounit.h: 86e94a9d9377bcd124dfd80600a66d19 +include/unicode/numberformatter.h: 5f13d5de2fb98bb5f6ce33e5b48698c3 +include/unicode/numberrangeformatter.h: 460fa1a21356b00a275e27a9a540140e +include/unicode/numfmt.h: 26724db0305eab9f3b810f3a6accc729 +include/unicode/numsys.h: f68bc678c30deeb7c50a104d852e40d8 +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: d5300bfbc1b2cd0081aecb71320e11ec +include/unicode/platform.h: d6aed91f3114fe877714fc554ad167ae +include/unicode/plurfmt.h: fa64bd7797a74e8e8769a12047c5bf3c +include/unicode/plurrule.h: 8d3eb6b9c5e6eec6da436601e42ec65e +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: a0202b93d684e8e595c0012e4cefca83 +include/unicode/rbnf.h: c951102dad30e81d893bc81df09820f5 +include/unicode/rbtz.h: f772120604410ff1f1492b1991d36163 +include/unicode/regex.h: e911b68edf768bc0c96b770fced3a7f5 +include/unicode/region.h: b0c3e0b2ad6650fbab876495b114b639 +include/unicode/reldatefmt.h: 99195dad14eef9b8992409fc066b97d7 +include/unicode/rep.h: d29a88e12fd288a0606a41464630a015 +include/unicode/resbund.h: 87a08c1ea0b825d2f99951e9be9f1127 +include/unicode/schriter.h: 9c196272282acc6ccf6cd34544095b63 +include/unicode/scientificnumberformatter.h: b0f20bc8a5b53b07a07d4576d3d6d928 +include/unicode/search.h: bee76013db18275ff842e90c6805ae72 +include/unicode/selfmt.h: 2457e48d1cf8ff880f1bdaf80a9e2fc7 +include/unicode/simpleformatter.h: 3dfb5ab658aecf124d329b645082b879 +include/unicode/simpletz.h: 07c17256943be808b2b2a597d3d27c33 +include/unicode/smpdtfmt.h: e5ba02765fd03756ba63ca138a47daf1 +include/unicode/sortkey.h: 25af96ad696ab793d62d67debb04c8ba +include/unicode/std_string.h: 2300a9ee3296c630373a6e8b685dff88 +include/unicode/strenum.h: 2d2998dd8033ac7272c39406cc3f8b51 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 4265692d09da7d3cd585bc6776a8a0c7 +include/unicode/stringtriebuilder.h: fc74bea13a3003c79ebeccc442703037 +include/unicode/stsearch.h: 33d820eada4a37ceb3f0bd9ff07ed63d +include/unicode/symtable.h: 763520aa161c95884efa6f6a5f29eb77 +include/unicode/tblcoll.h: 9aad9b68d582e13be85f437f815a3eb1 +include/unicode/timezone.h: 4e6b12c8e428fae21f99552d29544690 +include/unicode/tmunit.h: 9a1f159c304e2bd283d7cf61a0807c05 +include/unicode/tmutamt.h: 0890de21bc330b69b00f94c437e0f140 +include/unicode/tmutfmt.h: c344b95b816e04ed0bc895c6da6ef460 +include/unicode/translit.h: 3464c7b8023b7c131b0b533e1b372c3a +include/unicode/tzfmt.h: 2cb06301f2376b6802834105060311bf +include/unicode/tznames.h: b5935a11cb884e2e47ad732ee684037d +include/unicode/tzrule.h: bcba9c924da93d42e4f18f507c11e8cf +include/unicode/tztrans.h: 6e72d3497b3e68dc9aad510e2b45f781 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: c39d869ac0bca5859e78287092e40721 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: 25e6419710b325b53286cb7dcaf4af57 +include/unicode/ucharstrie.h: 644af4172d542594c40face6cbe01b5e +include/unicode/ucharstriebuilder.h: 52600c017361ee29f21a6fef13667948 +include/unicode/uchriter.h: 85c221ab993783ec8f7823713c30758c +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 0b6d71140d2f8e0cf618e5a54cf251af +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 680b99d4b154e14ac1ebcb9c60f5ab3c +include/unicode/ucpmap.h: a22571c78880dd947efc0ab547061a35 +include/unicode/ucptrie.h: 9b16abc66b11f53941ec5d90af1df0b0 +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 0ec2b114be8c462d4542c6e1d0bf2b8a +include/unicode/udat.h: 373cf290162e44eba9f2cf6dad278858 +include/unicode/udata.h: e747b190fadb0749c129aeff7e6eef54 +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: 078d2d548f3123fceae0d4056359a62e +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: 47ae4b93dddfe15d28400da09201090e +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 64859bc80c70c1e183f3537e1c354142 +include/unicode/uloc.h: b344a11407a95b108ef52a4d88c74d6a +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: b25221a74cab16d993f35108e6da340a +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 4fe0aaad80938fbe881a3fb447be1f24 +include/unicode/unifilt.h: 71e8ecdb31d706e8e0efc4bbdc9f86b5 +include/unicode/unifunct.h: 97d80d81556b54ac674d09643df98cfc +include/unicode/unimatch.h: 00eb31b1d65f3e0f03e7d880b1bb79fb +include/unicode/unirepl.h: c5eeec0e14a9666262d332c22124803f +include/unicode/uniset.h: 69b5447c36eec06421bc9038df3bd80e +include/unicode/unistr.h: e35ee05307a3338579df46718b049b32 +include/unicode/unorm.h: 3a1e6dcd474ef8b2c3377b34141bf6d3 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: ec868132b7242d85645d30dd549b25fc +include/unicode/unumberformatter.h: 0dc25c33373d63ca0beb10a9ef265237 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: c9a1e3afb798e0fbcad34b01b0bc5c3e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 7cd5ed487b56e2aeb354867a0b2cda5f +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: fc5b3e0d1096ff69c3a2397ef5b3a036 +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: 36896c874036542390b5a75a04f330c5 +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 6c2d471942085f091c8bc748a02f113e +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 6a3f303b73d795a0ff9a1b8d2758d88d +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: b0e85d74193953fcaa29de51853cc95a +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: d95d304275f6c688b0c4ae5620d57e4c +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7d5d7b60c96cccc184cdc5cd53447e7c +include/unicode/utf_old.h: c89c03a53abcf83e039ad4217246acd9 +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 35cbc5ec2fd02b703a449e896f48ebfe +include/unicode/utrans.h: 7a20730bb6d33441a5b9c886cc7cd0eb +include/unicode/utypes.h: be7b3c9d785b5d70b2f05e6dd527f026 +include/unicode/uvernum.h: 59a34f58b169d039a90da4e8824af662 +include/unicode/uversion.h: af19802ec4e905051d79ab4579a30bcd +include/unicode/vtzone.h: a9053ef95930bd854729360fe00fed7a +lib/icu/64.2/Makefile.inc: b9c41b216021001f76a7ee0e7a52be73 +lib/icu/64.2/pkgdata.inc: 97b000374f8cbf1bc206bd53c44b2484 +lib/icu/Makefile.inc: b9c41b216021001f76a7ee0e7a52be73 +lib/icu/current/Makefile.inc: b9c41b216021001f76a7ee0e7a52be73 +lib/icu/current/pkgdata.inc: 97b000374f8cbf1bc206bd53c44b2484 +lib/icu/pkgdata.inc: 97b000374f8cbf1bc206bd53c44b2484 +lib/icudt.dll: 4bf335f3c812239fdb288af9c7536ac4 +lib/icudt.lib: ef983e4199b691cb04ccd33f0d59d042 +lib/icudt64.dll: 5f5f9b34176b0c012f5d62cdd1d947d6 +lib/icuin.dll: 3da27ef4f6ed75685def244900ab251f +lib/icuin.lib: 7b4035a5a6b22ee5a062a4a7c11aeed6 +lib/icuin64.dll: 3da27ef4f6ed75685def244900ab251f +lib/icuio.dll: 3c0193269e42635affe3809d9fccb3eb +lib/icuio.lib: ca82aa1a25c7f1089855744bffaf9e4e +lib/icuio64.dll: 3c0193269e42635affe3809d9fccb3eb +lib/icutest.dll: 538469e7a3a2b678b9628df448d950fb +lib/icutest.lib: c0725af49af2df05b5cd1508cd7ed8d2 +lib/icutest64.dll: 538469e7a3a2b678b9628df448d950fb +lib/icutu.dll: aee92b3be1ad903962710112088b0a4e +lib/icutu.lib: b39b7512ad21ceb5734159f4061cb1cb +lib/icutu64.dll: aee92b3be1ad903962710112088b0a4e +lib/icuuc.dll: 187d80a431a3dd72bc5635e42680ee0d +lib/icuuc.lib: dfb526d79d8568a1b6db40e9c02ea072 +lib/icuuc64.dll: 187d80a431a3dd72bc5635e42680ee0d +lib/pkgconfig/icu-i18n.pc: d4740b0d88c4f31cdb35448da73f84c3 +lib/pkgconfig/icu-io.pc: 3a210f03beec91148eaf11f9f57aa22e +lib/pkgconfig/icu-uc.pc: 4c0594d00617771efbe334cf08c5e5b0 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/64.2/config/mh-msys-msvc: deb94ef2bd29c3471723b79091991a51 +share/icu/64.2/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/64.2/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: 140b84149f762ce47b2fe263aed44fb5 +share/man/man1/genbrk.1: f3b0b5c88f6562d93a27e776bf13987c +share/man/man1/gencfu.1: fc9b581c0fe513328c22b44ce035e0c1 +share/man/man1/gencnval.1: 696401204fbe4d17e8dac25eea70ce07 +share/man/man1/gendict.1: f3607026142ed53bf2d0bae71884ce02 +share/man/man1/genrb.1: 3860427c56aa1c847586737737325550 +share/man/man1/icu-config.1: 24f882d0de63c5fee2b10a2911b206f8 +share/man/man1/makeconv.1: ee9bdbd7ee11f0e705e6de72b86f29ac +share/man/man1/pkgdata.1: 2cb82b3e1c820002968867c3b2b5b811 +share/man/man1/uconv.1: 516c265d14b9f3ad72dceb2c2d23f2bb +share/man/man8/genccode.8: 0c9f23a8cec80bfdb6127197f1c3ed17 +share/man/man8/gencmn.8: 251c98aa763ab74829e074c5e6f21c98 +share/man/man8/gensprep.8: a3129a511adbb04310a2d900c15784e1 +share/man/man8/icupkg.8: 145940ae5e9a8aea3a93213f13ddd70c diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..0685a515 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,4 @@ +1563317256 +LICENSE.md: 5aa9930034582b90e2008d2c609d1317 +conanfile.py: f80221898becb58bc0de993097f98818 +export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt new file mode 100644 index 00000000..44600a77 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt @@ -0,0 +1,12 @@ +1563319076 +conaninfo.txt: f7407f0b37a177dbd8da281e911fae13 +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/libjpeg.a: 76c0df72f772b8437d4cbae90033e9e1 +lib/libturbojpeg.a: 5c6f3ef0620d46137252e6c3a74bd235 +lib/pkgconfig/libjpeg.pc: e8374a56760f12ee4e809879b1675b88 +lib/pkgconfig/libturbojpeg.pc: e9877f5ec875796a6063943cc96cfb3a +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt new file mode 100644 index 00000000..2b4c30ed --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt @@ -0,0 +1,12 @@ +1563317429 +conaninfo.txt: d18e9d7f8420204b797c974a3840cd84 +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: ff36c0d3e4e89fe38504b7902848cf43 +lib/pkgconfig/libjpeg.pc: aaa7ae7e53ca96542aa9dc600892a37f +lib/pkgconfig/libturbojpeg.pc: bd2d8c64e49e878fb5b3d9ec4e5d48cc +lib/turbojpeg-static.lib: b8f67c803866ebd5e8a4b78e5b1e69be +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt new file mode 100644 index 00000000..bf462a03 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt @@ -0,0 +1,12 @@ +1563317951 +conaninfo.txt: 30e51ce35bad9c012af4f30e6e7892ed +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: 9bc7573efc66b8352d20c75ccc749f02 +lib/pkgconfig/libjpeg.pc: 8262515528659421186ba8c1ec623689 +lib/pkgconfig/libturbojpeg.pc: 837f896e637fff65f9d69c867fafdfec +lib/turbojpeg-static.lib: c018bdcd94775b2a7b25c1a69742cf28 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt new file mode 100644 index 00000000..dcf9b779 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt @@ -0,0 +1,12 @@ +1563318848 +conaninfo.txt: 91949552e25a4ed2d26b7f0720dfb965 +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/libjpeg.a: 66c75997f3c87e8c27f51bd4c464f421 +lib/libturbojpeg.a: 1fdd01646bf0752dc56aa89326e81081 +lib/pkgconfig/libjpeg.pc: 5d283d46775e3e57e96354b3e019af5e +lib/pkgconfig/libturbojpeg.pc: f72af38bacd8a265b3d7c595b2fcb631 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt new file mode 100644 index 00000000..641788cf --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt @@ -0,0 +1,12 @@ +1563318176 +conaninfo.txt: 6ec16cc31fcf0bd158817c15ca8b5fab +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: 5cd2ee8719b6d66010f5467e5b2df897 +lib/pkgconfig/libjpeg.pc: 8d5435c5c55ee8c6ac656a369397ab7e +lib/pkgconfig/libturbojpeg.pc: 16682a8d9851f1b61285ef3ba5cd999e +lib/turbojpeg-static.lib: 9f40b2cddb0673e15b28f5a345cd9d58 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt new file mode 100644 index 00000000..6a50555a --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt @@ -0,0 +1,12 @@ +1563317644 +conaninfo.txt: 2c723d8a067380f691577b026b7edafd +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: 08048bd6e49dfd238c50d5063f1c3141 +lib/pkgconfig/libjpeg.pc: 5523669f66f81e12a045408fac68bbde +lib/pkgconfig/libturbojpeg.pc: 3261437bc15909fb4090d70cc282eaa9 +lib/turbojpeg-static.lib: 5430670586f6bde839d35b9a98d57624 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index c5714a18..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1478795230 -conanfile.py: 677544f321559ff6cc9d738c8b609308 \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt deleted file mode 100644 index b68bca2b..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt +++ /dev/null @@ -1,320 +0,0 @@ -1478728779 -bin/libxml2-2.dll: 6393dbaab96c3c733b8c78dbf0adba46 -bin/xml2-config: d50d6a18c0f68d0b3ef5939ee20d59f8 -bin/xmlcatalog.exe: a2762f091400139b67e01c54de582896 -bin/xmllint.exe: 6582dafc121c69b8727bed62b9fbc74f -conaninfo.txt: a2d34e82b2ec55a9a2ffcafb7e6451f7 -include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml/xmlversion.h: 22579da9671c7d2d7662135fe8523088 -include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml2/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml2/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml2/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml2/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml2/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml2/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml2/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml2/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml2/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml2/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml2/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml2/libxml/xmlversion.h: 90bea4a276022638ecb073eea7c849e4 -include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/win32config.h: 410df263529fb9ec616b22f590dbdd1d -include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/cmake/libxml2/libxml2-config.cmake: 905864882fbb75196d4618cdf923ef78 -lib/libxml2.dll.a: 6944466ef81a685127a88f1ec6c528a2 -lib/libxml2.la: 82844cbca6a62f0052bb403866940c5c -lib/pkgconfig/libxml-2.0.pc: 85b1b86303c386209ad29dd2d909dfd3 -lib/xml2Conf.sh: 1ae0e5bede910b47b1cb3adc34cf7acf -share/aclocal/libxml.m4: a07f9db1c83755505dbf961c953efdf8 -share/doc/libxml2-2.9.4/Copyright: 2044417e2e5006b65a8b9067b683fcf1 -share/doc/libxml2-2.9.4/examples/testHTML.c: 6b181ebf4001bb62b07c7be7d79a2f01 -share/doc/libxml2-2.9.4/examples/testSAX.c: 34e3e9b268e1915652c15c4be11216a8 -share/doc/libxml2-2.9.4/examples/testXPath.c: 1db9d6ae0438d72387bcfd0ff1ae5ce4 -share/doc/libxml2-2.9.4/examples/xmllint.c: fc1fb77452cd8975c74b5f2664330feb -share/doc/libxml2-2.9.4/html/DOM.gif: b3d91cf23f7c9199b395356ea98cd097 -share/doc/libxml2-2.9.4/html/FAQ.html: 46b6bf6536bf9b2652891363aafb0b58 -share/doc/libxml2-2.9.4/html/Libxml2-Logo-180x168.gif: 6704060ba0272a9624e0a732455439ba -share/doc/libxml2-2.9.4/html/Libxml2-Logo-90x34.gif: 29dfd4b3dec5fee179d3dc7e3d65be8a -share/doc/libxml2-2.9.4/html/encoding.html: 3be0aba75968021dc9be873c020b93a9 -share/doc/libxml2-2.9.4/html/examples.xml: e6fad87730c6957a238a06ad3e33a4e9 -share/doc/libxml2-2.9.4/html/examples.xsl: 821de9e855568781f8c87ad0fe9afcba -share/doc/libxml2-2.9.4/html/html/book1.html: 461321024ef78221594067503eb0eba0 -share/doc/libxml2-2.9.4/html/html/home.png: f6192f4292d744423df690e785d60fdf -share/doc/libxml2-2.9.4/html/html/index.html: 461321024ef78221594067503eb0eba0 -share/doc/libxml2-2.9.4/html/html/left.png: f771308152ab24a69682daed70ce136d -share/doc/libxml2-2.9.4/html/html/libxml-DOCBparser.html: a9c425e3ab0c095b85759a321c294a72 -share/doc/libxml2-2.9.4/html/html/libxml-HTMLparser.html: b20a43ee13f4a8020b84830aa83cefb0 -share/doc/libxml2-2.9.4/html/html/libxml-HTMLtree.html: b639bc91545a89e12d9c0a34a23bd6de -share/doc/libxml2-2.9.4/html/html/libxml-SAX.html: a1dddf7f62888196c45c587a216cbe8a -share/doc/libxml2-2.9.4/html/html/libxml-SAX2.html: 2d8812144ee7796aa073b748ba560d34 -share/doc/libxml2-2.9.4/html/html/libxml-c14n.html: af407530b72ad6d8342eab7e3d90207b -share/doc/libxml2-2.9.4/html/html/libxml-catalog.html: 6ccaf618b222577f8b1c9ed8278ea357 -share/doc/libxml2-2.9.4/html/html/libxml-chvalid.html: 4bec2549c1505b9048041b722cb052c6 -share/doc/libxml2-2.9.4/html/html/libxml-debugXML.html: b1b29857fbff5d68b7bdf982f8b9f6c7 -share/doc/libxml2-2.9.4/html/html/libxml-dict.html: 390df4fbbac8f9ba0a1338bc448b6ad4 -share/doc/libxml2-2.9.4/html/html/libxml-encoding.html: 812d49f58d6f7721ccf9289c0813a473 -share/doc/libxml2-2.9.4/html/html/libxml-entities.html: d4ae454060415d31a5eec7a09d6c05a3 -share/doc/libxml2-2.9.4/html/html/libxml-globals.html: 7487fd3b2740f53f259016b9032caf19 -share/doc/libxml2-2.9.4/html/html/libxml-hash.html: 53ff0d00bc6b42b1f6981a58a4bc5ff8 -share/doc/libxml2-2.9.4/html/html/libxml-lib.html: 461321024ef78221594067503eb0eba0 -share/doc/libxml2-2.9.4/html/html/libxml-list.html: 086afdd20e6be957346251d3ea8552f0 -share/doc/libxml2-2.9.4/html/html/libxml-nanoftp.html: c07d479ce51894e6181be84cd7afc8f6 -share/doc/libxml2-2.9.4/html/html/libxml-nanohttp.html: a4457c15280d27457677a436286c344e -share/doc/libxml2-2.9.4/html/html/libxml-parser.html: d9abc1e3b231427736e24bb53d310edf -share/doc/libxml2-2.9.4/html/html/libxml-parserInternals.html: dc212b49555db1f4d3473021415990f5 -share/doc/libxml2-2.9.4/html/html/libxml-pattern.html: bff29ccd97d10d65cd40201985ba2501 -share/doc/libxml2-2.9.4/html/html/libxml-relaxng.html: da69ff4b925629ce5667c63895aecf3f -share/doc/libxml2-2.9.4/html/html/libxml-schemasInternals.html: 9fe427f9b1b272d687e6ed524df9ac77 -share/doc/libxml2-2.9.4/html/html/libxml-schematron.html: f0ddff7bae5bba25b1c98abd75038c36 -share/doc/libxml2-2.9.4/html/html/libxml-threads.html: 8bfd4253309b18e5b94f01228f3c6887 -share/doc/libxml2-2.9.4/html/html/libxml-tree.html: dd8a9d64d5cd75bcecfcfa530a298cf1 -share/doc/libxml2-2.9.4/html/html/libxml-uri.html: 9b4186c1502963221da42717dfcf2789 -share/doc/libxml2-2.9.4/html/html/libxml-valid.html: 51b24ec90bd3c5591130fa219172dca8 -share/doc/libxml2-2.9.4/html/html/libxml-xinclude.html: 2639d942d8a7bb71201ef35d8dd0a5d1 -share/doc/libxml2-2.9.4/html/html/libxml-xlink.html: 1de0d3b14ab220eb6b51bfa254b03769 -share/doc/libxml2-2.9.4/html/html/libxml-xmlIO.html: e9d7b75133b68febff966553614ca1e3 -share/doc/libxml2-2.9.4/html/html/libxml-xmlautomata.html: 28a6fdabf1bcc027c5723ef484551a3b -share/doc/libxml2-2.9.4/html/html/libxml-xmlerror.html: 13b79642aa3895e095f83dc5ebddc7d9 -share/doc/libxml2-2.9.4/html/html/libxml-xmlexports.html: 76a89eb95c8256a4277f65250245ef9a -share/doc/libxml2-2.9.4/html/html/libxml-xmlmemory.html: ea097805488added49ebb2f1373c212a -share/doc/libxml2-2.9.4/html/html/libxml-xmlmodule.html: dad4c35e0c0a8fb9bc1db2d42ae5f664 -share/doc/libxml2-2.9.4/html/html/libxml-xmlreader.html: 61db95ee91a1056009c76ad04c7aad47 -share/doc/libxml2-2.9.4/html/html/libxml-xmlregexp.html: fc8289c2885a2e9adae8ce5f3f784f4d -share/doc/libxml2-2.9.4/html/html/libxml-xmlsave.html: 8e4208e2908bd9a021c31ee1338755d2 -share/doc/libxml2-2.9.4/html/html/libxml-xmlschemas.html: 455628ea9eca007ecaa224305df3b0c8 -share/doc/libxml2-2.9.4/html/html/libxml-xmlschemastypes.html: f698db4a289728d46199ad42160da1d3 -share/doc/libxml2-2.9.4/html/html/libxml-xmlstring.html: 708539f930210582860e0374d501b801 -share/doc/libxml2-2.9.4/html/html/libxml-xmlunicode.html: 7b282351048157db2233f4a8c9ed305c -share/doc/libxml2-2.9.4/html/html/libxml-xmlversion.html: d9e2cd59ac2a1aa5319d09f7ad726a63 -share/doc/libxml2-2.9.4/html/html/libxml-xmlwriter.html: f7345386e22ec21cf60d91371eeaed57 -share/doc/libxml2-2.9.4/html/html/libxml-xpath.html: 9e3290a0c3f1704b066d736cdadaa93f -share/doc/libxml2-2.9.4/html/html/libxml-xpathInternals.html: 463d1f6b154041eaed041a32ffd5a8c5 -share/doc/libxml2-2.9.4/html/html/libxml-xpointer.html: 578d2d95c3a254fdd208d5eb5d8bc063 -share/doc/libxml2-2.9.4/html/html/libxml-xzlib.html: 8d55e7cdc5a0363d945c8a672841bd6f -share/doc/libxml2-2.9.4/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 -share/doc/libxml2-2.9.4/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa -share/doc/libxml2-2.9.4/html/index.html: 854eae61c805261731f38a873415144f -share/doc/libxml2-2.9.4/html/io1.c: 8861af9d5ae163e2679d14cccd7c50a8 -share/doc/libxml2-2.9.4/html/io1.res: c1063365cedce05c3c75361d8b21eda0 -share/doc/libxml2-2.9.4/html/io2.c: 064a8c92267a391f5cbc41dbf49b14ad -share/doc/libxml2-2.9.4/html/io2.res: c6a030758261e4b23c18fe8fa9b9f1cb -share/doc/libxml2-2.9.4/html/libxml.gif: 7b77627ea524c095934962f5dee442cb -share/doc/libxml2-2.9.4/html/parse1.c: 35924de5d0e047f4e2732e8ef4d31fea -share/doc/libxml2-2.9.4/html/parse2.c: 1533aa6faa9efa078a56d2d37b4e318c -share/doc/libxml2-2.9.4/html/parse3.c: 745ea8e70138377b1fb1d0e3116dba63 -share/doc/libxml2-2.9.4/html/parse4.c: 1ebc80d9df8a1b0568f9cf7a2cc70a3e -share/doc/libxml2-2.9.4/html/reader1.c: b30f26d62bb3c37fc9cba51fff13924e -share/doc/libxml2-2.9.4/html/reader1.res: c7e547f58d4407d091d189a1ebfeab77 -share/doc/libxml2-2.9.4/html/reader2.c: 8b66731b71444ec57b99acc9d41a5f1d -share/doc/libxml2-2.9.4/html/reader3.c: 2874d5506c9f0b9f4a1dead26d58e559 -share/doc/libxml2-2.9.4/html/reader3.res: ce152220e5a24918935d6f0c8bbcf587 -share/doc/libxml2-2.9.4/html/reader4.c: c7d0e7908cfc12c1102a58f4e530bbfd -share/doc/libxml2-2.9.4/html/reader4.res: 2f8c9c74667d1434104e5610a77f824f -share/doc/libxml2-2.9.4/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 -share/doc/libxml2-2.9.4/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f -share/doc/libxml2-2.9.4/html/structure.gif: f10610a92f24c3f0fc35078f5764867e -share/doc/libxml2-2.9.4/html/test1.xml: 5ffe018a2890cdd13b4d08d674cf8dd4 -share/doc/libxml2-2.9.4/html/test2.xml: 4084cf4871ee86fef27f5e5ee91ea455 -share/doc/libxml2-2.9.4/html/test3.xml: 0ba76ca9c89e995bbaf258ab154e5205 -share/doc/libxml2-2.9.4/html/testWriter.c: f76b29aaee2bb1f0323ed8b28a45a794 -share/doc/libxml2-2.9.4/html/tree1.c: 8e3b9f050ff7e6ecd2912940cbb2394f -share/doc/libxml2-2.9.4/html/tree1.res: 4d4d5f3e8297d35e59d9f92c876b42ac -share/doc/libxml2-2.9.4/html/tree2.c: 58c5720b77f06428c3824c66003c6b73 -share/doc/libxml2-2.9.4/html/tree2.res: 8e5cc417bcb23115c4f802404e09657e -share/doc/libxml2-2.9.4/html/tst.xml: 6d10ac1b8fb04bc8fb73f9964589a223 -share/doc/libxml2-2.9.4/html/tutorial/apa.html: 51b23839855ffbb232c8ba2211a4d9ca -share/doc/libxml2-2.9.4/html/tutorial/apb.html: 6fa0d1a793a7d794967c497dc9112077 -share/doc/libxml2-2.9.4/html/tutorial/apc.html: c263a905499b8177ee93b6ab39b26266 -share/doc/libxml2-2.9.4/html/tutorial/apd.html: 9f3342db337c1a28df32d4b85eba94be -share/doc/libxml2-2.9.4/html/tutorial/ape.html: 69164a2345a37ac0b1001f2084ee5abc -share/doc/libxml2-2.9.4/html/tutorial/apf.html: 4b58ea573ee05ceb46cac6c3eeef8211 -share/doc/libxml2-2.9.4/html/tutorial/apg.html: a84665f786e99169afa8e9dceb5003ca -share/doc/libxml2-2.9.4/html/tutorial/aph.html: d49dfaba969e5b9161748d98b6f8eb0b -share/doc/libxml2-2.9.4/html/tutorial/api.html: 0433fb6f377e50662e0f89b1e2f8e49a -share/doc/libxml2-2.9.4/html/tutorial/ar01s02.html: d2b5e466f1613a0a281969296efe652e -share/doc/libxml2-2.9.4/html/tutorial/ar01s03.html: af7d8b5f8bf6e7c6949c5f1b260289ef -share/doc/libxml2-2.9.4/html/tutorial/ar01s04.html: 08161b16d07d12969e2ff0db52c0006d -share/doc/libxml2-2.9.4/html/tutorial/ar01s05.html: a39259d226409f45e234b8e4f0ae1e9f -share/doc/libxml2-2.9.4/html/tutorial/ar01s06.html: 4d622cd5afe28d58e8808651c896ff1e -share/doc/libxml2-2.9.4/html/tutorial/ar01s07.html: c3d0264c72c908e119c22c7787892db9 -share/doc/libxml2-2.9.4/html/tutorial/ar01s08.html: 47bfaa87452e5e5d3436b232d96b1cf7 -share/doc/libxml2-2.9.4/html/tutorial/ar01s09.html: 066052f4864add31dffd8fc4bb1b9b7f -share/doc/libxml2-2.9.4/html/tutorial/images/blank.png: 6f7573d4bb6bf0f55ed9ebd79f3f786f -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/1.png: 0f67842b8cc059137a88288e95115a18 -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/10.png: 29fd9e419eee2efa4ef6ce493ca51a9c -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/2.png: 782f998bab59d0221977c1c0eaa676c8 -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/3.png: 35dcf1dd29a802080c984e52d76e5b1f -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/4.png: 3d412b47729eb73afc7aa430feeb7da0 -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/5.png: 489005941fbb522369466ca850189c59 -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/6.png: f64cfcfac0c4219edebc96d6d043c84c -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/7.png: 0def94f52c5e45256232320aaffeb1ce -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/8.png: 2f899cf0909049b0472654d7357eaeb3 -share/doc/libxml2-2.9.4/html/tutorial/images/callouts/9.png: 5ba16a0731d050493bd7e0b95244aafc -share/doc/libxml2-2.9.4/html/tutorial/images/caution.png: 2245032ab69fc481e2eefd246aa96e07 -share/doc/libxml2-2.9.4/html/tutorial/images/draft.png: 1b1da3ec69df05af5f2a5475e8a8a24b -share/doc/libxml2-2.9.4/html/tutorial/images/home.png: 700644702db92b31d7488edfb3adfe7e -share/doc/libxml2-2.9.4/html/tutorial/images/important.png: ca20b7b781cf82d1aeb36ce63590ccd0 -share/doc/libxml2-2.9.4/html/tutorial/images/next.png: c4ec8d7f81407ce09d175d7366c25ba0 -share/doc/libxml2-2.9.4/html/tutorial/images/note.png: 109e4af9c43357a74c6de01db819f36f -share/doc/libxml2-2.9.4/html/tutorial/images/prev.png: 2188e42454c65ed8a37126d0f5f5830a -share/doc/libxml2-2.9.4/html/tutorial/images/tip.png: dbb88aaf05b4a6a7df59c72cc5c947b4 -share/doc/libxml2-2.9.4/html/tutorial/images/toc-blank.png: a9dfccc01739501bbc01d561da12c944 -share/doc/libxml2-2.9.4/html/tutorial/images/toc-minus.png: 72baddf4a76d4d74f634edf1e71134b3 -share/doc/libxml2-2.9.4/html/tutorial/images/toc-plus.png: ee8d311bafbc474875730d7644e86047 -share/doc/libxml2-2.9.4/html/tutorial/images/up.png: ddf37bee4d12f626b42004e26bdd4e13 -share/doc/libxml2-2.9.4/html/tutorial/images/warning.png: 59c28f6840b1f20094af4ffc16ce3189 -share/doc/libxml2-2.9.4/html/tutorial/includeaddattribute.c: ba57721ff902105ef3c79eb199f4da5e -share/doc/libxml2-2.9.4/html/tutorial/includeaddkeyword.c: 268f90fc598ccf5a5bd1de7d1f57c873 -share/doc/libxml2-2.9.4/html/tutorial/includeconvert.c: b91e86a449cb257dd92ada947c2b2320 -share/doc/libxml2-2.9.4/html/tutorial/includegetattribute.c: af83032a68f54f420f04430efd7629c8 -share/doc/libxml2-2.9.4/html/tutorial/includekeyword.c: 5508972bd6f704cddb4b4faeaa5397b0 -share/doc/libxml2-2.9.4/html/tutorial/includexpath.c: a9718d128b1abbf9710cb7ea315cffec -share/doc/libxml2-2.9.4/html/tutorial/index.html: c3df2af08328cd4cbf697d55ca9cd419 -share/doc/libxml2-2.9.4/html/tutorial/ix01.html: 2f9c98d5610fc9a8f02c7312c3c49691 -share/doc/libxml2-2.9.4/html/tutorial/xmltutorial.pdf: 12df01000d92ab495235de65abcd4e46 -share/doc/libxml2-2.9.4/html/w3c.png: ba69544b9cfa7659a0bb1b81410680a9 -share/doc/libxml2-2.9.4/html/writer.xml: 1e16356328b8e3fa703a18858a11f3bb -share/doc/libxml2-2.9.4/html/xml.html: 238ceba29df713265480f81bf31c1f1a -share/doc/libxml2-2.9.4/html/xpath1.c: 87445983c77091ef0441ff775fb8edc6 -share/doc/libxml2-2.9.4/html/xpath1.res: cf508aadb27c5c145ac58d256326e8eb -share/doc/libxml2-2.9.4/html/xpath2.c: 413d481a75246b5af3d8e7f489e3408f -share/doc/libxml2-2.9.4/html/xpath2.res: c32344efbb7334a5f2563420e0d1723c -share/gtk-doc/html/libxml2/general.html: df2b20bc526b927eefa3f401349d1287 -share/gtk-doc/html/libxml2/home.png: f6192f4292d744423df690e785d60fdf -share/gtk-doc/html/libxml2/index.html: b0b369ddf6959a2604b422c9268a0a3f -share/gtk-doc/html/libxml2/left.png: f771308152ab24a69682daed70ce136d -share/gtk-doc/html/libxml2/libxml2-DOCBparser.html: bde929bed90adf39144b561ad443c278 -share/gtk-doc/html/libxml2/libxml2-HTMLparser.html: 448bf8a3ac020486b4b50ac3cdd52c16 -share/gtk-doc/html/libxml2/libxml2-HTMLtree.html: e53dcd12a0e8e51413ca1de4986d7898 -share/gtk-doc/html/libxml2/libxml2-SAX.html: 5ba9dd3cf89972a337869e55024aeb0e -share/gtk-doc/html/libxml2/libxml2-SAX2.html: 9a8574da93ad762a54194f690db4dbee -share/gtk-doc/html/libxml2/libxml2-c14n.html: 57a9ef60a8af4df6586ab78061a75fd6 -share/gtk-doc/html/libxml2/libxml2-catalog.html: bcd705392f52867a1afadc1166739d17 -share/gtk-doc/html/libxml2/libxml2-chvalid.html: dca486d382dbf88f4d9155e3f7a826cf -share/gtk-doc/html/libxml2/libxml2-debugXML.html: efd04207438816e0ce69c47bc93e525b -share/gtk-doc/html/libxml2/libxml2-dict.html: 3d220f5057f1d2f86c2d900763855a53 -share/gtk-doc/html/libxml2/libxml2-encoding.html: eac9c8c39be246af865c4ad51bf94d32 -share/gtk-doc/html/libxml2/libxml2-entities.html: 3afcaf72917d0f9dda002baf4445e936 -share/gtk-doc/html/libxml2/libxml2-globals.html: 08b752bd53e687bf8ac51400c62ded68 -share/gtk-doc/html/libxml2/libxml2-hash.html: 11b6563618a2b99b9831857a5e81cfd2 -share/gtk-doc/html/libxml2/libxml2-list.html: e26c2e29812e0dd9b790a38f447f6aba -share/gtk-doc/html/libxml2/libxml2-nanoftp.html: 79f4eb67e7eb955c19bd5337a8cc5177 -share/gtk-doc/html/libxml2/libxml2-nanohttp.html: 0eac4dace4fda9fcd0bb2ebb6c16aaf0 -share/gtk-doc/html/libxml2/libxml2-parser.html: c3f66200ba47bd8198ec81aa3c8ce608 -share/gtk-doc/html/libxml2/libxml2-parserInternals.html: b2757ce5c41539e70df72da43af67825 -share/gtk-doc/html/libxml2/libxml2-pattern.html: 6129a6b5661fc0a38d5c967153651d26 -share/gtk-doc/html/libxml2/libxml2-relaxng.html: f98fee61d7e051dff9719e13b768b26c -share/gtk-doc/html/libxml2/libxml2-schemasInternals.html: f69402825563b84f449e76963e654c55 -share/gtk-doc/html/libxml2/libxml2-schematron.html: b3700a489202f309f02c6309f9d86984 -share/gtk-doc/html/libxml2/libxml2-threads.html: bb12a300c2c86bc49f586858a1ef6cd0 -share/gtk-doc/html/libxml2/libxml2-tree.html: 18d8636860bdf93d9a33d4780c84db61 -share/gtk-doc/html/libxml2/libxml2-uri.html: c46c9dfea580890ac48b70346c987bf0 -share/gtk-doc/html/libxml2/libxml2-valid.html: b4165290c6751ed9b2074eb915f0601f -share/gtk-doc/html/libxml2/libxml2-xinclude.html: 644e5093b3931eee1fece47fb9a3c908 -share/gtk-doc/html/libxml2/libxml2-xlink.html: fe35c6e86ba9419aea9f628ed45bc57a -share/gtk-doc/html/libxml2/libxml2-xmlIO.html: 1dd2f72b5a9014978f94155981fa6486 -share/gtk-doc/html/libxml2/libxml2-xmlautomata.html: 9cd301cf92ecca4ff9e896663f6d6570 -share/gtk-doc/html/libxml2/libxml2-xmlerror.html: 00e0588cbbeed28f03ca5665d6ff27ec -share/gtk-doc/html/libxml2/libxml2-xmlexports.html: 62aebfe3442aedae77f8ff0514a8160c -share/gtk-doc/html/libxml2/libxml2-xmlmemory.html: 8c22f5ea8ddd2ed6795726d714b4ab9f -share/gtk-doc/html/libxml2/libxml2-xmlmodule.html: 215331b3567ef3b2e79cf35b1998a357 -share/gtk-doc/html/libxml2/libxml2-xmlreader.html: 576384e2dd8965ab77e6f459022d827f -share/gtk-doc/html/libxml2/libxml2-xmlregexp.html: 1a42a4508373992c4471d360bf1cdf4f -share/gtk-doc/html/libxml2/libxml2-xmlsave.html: ee31535906cba2ee6455e430f48eb236 -share/gtk-doc/html/libxml2/libxml2-xmlschemas.html: 55b5ed0793dd7f64e9c25cfe4be40287 -share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html: aa49b7bc4fe1493b926c035484fd77af -share/gtk-doc/html/libxml2/libxml2-xmlstring.html: 92b3946891a43aaa8d983f599b9aadf0 -share/gtk-doc/html/libxml2/libxml2-xmlunicode.html: 9ac652a74d46f8c3e1caa26c19732b2a -share/gtk-doc/html/libxml2/libxml2-xmlversion.html: 11a6e7c28ccbdbc1ca91213139decfa9 -share/gtk-doc/html/libxml2/libxml2-xmlwriter.html: 088d1735eaf6fcd0e4117c3cad0aa691 -share/gtk-doc/html/libxml2/libxml2-xpath.html: 09af6c8f3ce2aec4abfc523bc197bda6 -share/gtk-doc/html/libxml2/libxml2-xpathInternals.html: 7e1cd39d27fb760f721fb1f5e276dcf9 -share/gtk-doc/html/libxml2/libxml2-xpointer.html: eb4ef1b1665e08fd1c43e44f311367bb -share/gtk-doc/html/libxml2/libxml2.devhelp: dec063a88e7aa03c218f1a7a93cfb912 -share/gtk-doc/html/libxml2/right.png: ebd7e6d206d73850d77d305ab548f957 -share/gtk-doc/html/libxml2/style.css: a7b180ebf583ed0c315d70d6a4890f79 -share/gtk-doc/html/libxml2/up.png: 2f07d9272deb4ae870ca6821117877fa -share/man/man1/xml2-config.1: f9ea1b8ede868111a96fc3dbd9db79e6 -share/man/man1/xmlcatalog.1: c01059c82575fe971688706702d175e7 -share/man/man1/xmllint.1: c2da2d5425849f19b8b0d355f5215973 -share/man/man3/libxml.3: 1bc9e496f1d34157a9e0d1b65704819a \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index 54a81a2e..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1499347513 -conanfile.py: 13d33f258924b0e194abbae675d10623 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt deleted file mode 100644 index 46e106f7..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt +++ /dev/null @@ -1,55 +0,0 @@ -1499348590 -bin/libxml2.dll: 21125a168735fe1f2da4ed04d7478ae6 -conaninfo.txt: 38d79dbe71569466f32385561d0a7c01 -include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10 -include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/win32config.h: 410df263529fb9ec616b22f590dbdd1d -include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: 8401cfb31c445b419fd36f7cca9287ba -lib/libxml2_a.lib: b44b970cfaee62a922b7424646f07bbc -lib/libxml2_a_dll.lib: b7a0af9a50e80ab55a92714e1068f48c diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt deleted file mode 100644 index 5aded80c..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt +++ /dev/null @@ -1,55 +0,0 @@ -1499348835 -bin/libxml2.dll: d9a4499bddd011be860ed1414a2cbae4 -conaninfo.txt: 64d85058962adbbc211c59513c575f8e -include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10 -include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/win32config.h: 410df263529fb9ec616b22f590dbdd1d -include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: 1943502c63f1459602a39bd2323d38f6 -lib/libxml2_a.lib: fd6456fbcd17a0467525faad0666ff8b -lib/libxml2_a_dll.lib: a4c27aa254afe3f1b0279a92421e7342 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt deleted file mode 100644 index e07078e6..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt +++ /dev/null @@ -1,55 +0,0 @@ -1499348420 -bin/libxml2.dll: d97dd77e1ca7b5cc92bb16f1519c2f02 -conaninfo.txt: 2954c763996d7723b688af93f860be53 -include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10 -include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/win32config.h: 410df263529fb9ec616b22f590dbdd1d -include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: 63bd590c414dfc9907df9e8cea6c3ba6 -lib/libxml2_a.lib: e811e6c280f3715f435ea3d7cebda6c2 -lib/libxml2_a_dll.lib: e2c6edb8085198269970611c68edffaf diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt deleted file mode 100644 index 75b0084f..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt +++ /dev/null @@ -1,55 +0,0 @@ -1499348033 -bin/libxml2.dll: 41e781ae591bbf0b36780ccce4565226 -conaninfo.txt: 6ef37ed57f0f92d64efc139dff95365b -include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d -include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 -include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f -include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa -include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 -include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f -include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e -include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e -include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 -include/libxml/dict.h: 93b78165ce896cbda4417bd278259714 -include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778 -include/libxml/entities.h: 16467595fdaff28420d1657b1658f267 -include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357 -include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b -include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7 -include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a -include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 -include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 -include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 -include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 -include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba -include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7 -include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 -include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265 -include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb -include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf -include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 -include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef -include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 -include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d -include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a -include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 -include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c -include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 -include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 -include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f -include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b -include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d -include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 -include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 -include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 -include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 -include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10 -include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 -include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 -include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd -include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 -include/win32config.h: 410df263529fb9ec616b22f590dbdd1d -include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: d7556bca5f0c194de00b118175c9e786 -lib/libxml2_a.lib: 2e4f2027834a545ab38246c576ff0f31 -lib/libxml2_a_dll.lib: 1932915fa9f066097c72915cabea32a0 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..4ae813dc --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,4 @@ +1563312451 +LICENSE.md: 5aa9930034582b90e2008d2c609d1317 +conanfile.py: ccf2921e844affb96a4da65b7272cfc5 +export_source/FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/0576a44cadaf801a35075ee2885891b12616dbb9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/0576a44cadaf801a35075ee2885891b12616dbb9/conanmanifest.txt new file mode 100644 index 00000000..1f9402da --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/0576a44cadaf801a35075ee2885891b12616dbb9/conanmanifest.txt @@ -0,0 +1,57 @@ +1563313057 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2.dll: 0663731980bb5825bc40424f4dedf2ad +bin/xmlcatalog.exe: 6c78c8607751fac92cb6b7e2aa114d41 +bin/xmllint.exe: 899b5bf615155460ef9f1c9e8c378c62 +conaninfo.txt: 43bcadd86eb95b1ececb8eb5bb363cc0 +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: e3b607d4f9fb7f1efffd2a983cdd3563 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/libxml2.lib: 08c8e1421562bb62aee40892226151ec +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/228fe6274aa7b6b50620b9e88bd3505648dacfd9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/228fe6274aa7b6b50620b9e88bd3505648dacfd9/conanmanifest.txt new file mode 100644 index 00000000..9ca47ec2 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/228fe6274aa7b6b50620b9e88bd3505648dacfd9/conanmanifest.txt @@ -0,0 +1,274 @@ +1563313980 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2-2.dll: 15a6499bd578ade12e2cf23132a80c0a +bin/xml2-config: 8928b07e20f1e79cdf49a6b6bd41ac43 +bin/xmlcatalog.exe: 35d5476cb769eea55ca9b3477d0fd793 +bin/xmllint.exe: 14b1972dc6dcfefb0286c9cdfe578873 +conaninfo.txt: 31e483fb81ef6da53e5e7c43e641cce3 +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: 23a57bce6575bfbeea3ce80479990313 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/cmake/libxml2/libxml2-config.cmake: 52555e668f1ac8a60ed70f97137e235b +lib/libxml2.dll.a: 1727a0e231ae14d0a847108d588727f8 +lib/pkgconfig/libxml-2.0.pc: 4ab65cc88734f5b0fd61903eb57c2375 +lib/xml2Conf.sh: 31d3c8499fc68d2d81616b021ddf13bd +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 +share/aclocal/libxml.m4: c6969a0bf79628df8bf639433092d7b2 +share/doc/libxml2-2.9.9/Copyright: 2044417e2e5006b65a8b9067b683fcf1 +share/doc/libxml2-2.9.9/examples/testHTML.c: 6b181ebf4001bb62b07c7be7d79a2f01 +share/doc/libxml2-2.9.9/examples/testSAX.c: 34e3e9b268e1915652c15c4be11216a8 +share/doc/libxml2-2.9.9/examples/testXPath.c: 1db9d6ae0438d72387bcfd0ff1ae5ce4 +share/doc/libxml2-2.9.9/examples/xmllint.c: 15e78f93aab67d34d487eaeef8d7df22 +share/doc/libxml2-2.9.9/html/DOM.gif: b3d91cf23f7c9199b395356ea98cd097 +share/doc/libxml2-2.9.9/html/FAQ.html: 46b6bf6536bf9b2652891363aafb0b58 +share/doc/libxml2-2.9.9/html/Libxml2-Logo-180x168.gif: 6704060ba0272a9624e0a732455439ba +share/doc/libxml2-2.9.9/html/Libxml2-Logo-90x34.gif: 29dfd4b3dec5fee179d3dc7e3d65be8a +share/doc/libxml2-2.9.9/html/encoding.html: 3be0aba75968021dc9be873c020b93a9 +share/doc/libxml2-2.9.9/html/examples.xml: e94ff0f46d36f998999908d5f55cbbe9 +share/doc/libxml2-2.9.9/html/examples.xsl: 821de9e855568781f8c87ad0fe9afcba +share/doc/libxml2-2.9.9/html/html/book1.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/home.png: f6192f4292d744423df690e785d60fdf +share/doc/libxml2-2.9.9/html/html/index.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/left.png: f771308152ab24a69682daed70ce136d +share/doc/libxml2-2.9.9/html/html/libxml-DOCBparser.html: a9c425e3ab0c095b85759a321c294a72 +share/doc/libxml2-2.9.9/html/html/libxml-HTMLparser.html: 9bed50ea5f7ef6398a54151a85e5d82e +share/doc/libxml2-2.9.9/html/html/libxml-HTMLtree.html: b639bc91545a89e12d9c0a34a23bd6de +share/doc/libxml2-2.9.9/html/html/libxml-SAX.html: a1dddf7f62888196c45c587a216cbe8a +share/doc/libxml2-2.9.9/html/html/libxml-SAX2.html: 2d8812144ee7796aa073b748ba560d34 +share/doc/libxml2-2.9.9/html/html/libxml-c14n.html: af407530b72ad6d8342eab7e3d90207b +share/doc/libxml2-2.9.9/html/html/libxml-catalog.html: 6ccaf618b222577f8b1c9ed8278ea357 +share/doc/libxml2-2.9.9/html/html/libxml-chvalid.html: 4bec2549c1505b9048041b722cb052c6 +share/doc/libxml2-2.9.9/html/html/libxml-debugXML.html: b1b29857fbff5d68b7bdf982f8b9f6c7 +share/doc/libxml2-2.9.9/html/html/libxml-dict.html: 01ef47c7c40b6bcdcea9c6ee95a20780 +share/doc/libxml2-2.9.9/html/html/libxml-encoding.html: 9158690112453706058d7c502fd881e1 +share/doc/libxml2-2.9.9/html/html/libxml-entities.html: d4ae454060415d31a5eec7a09d6c05a3 +share/doc/libxml2-2.9.9/html/html/libxml-globals.html: 7487fd3b2740f53f259016b9032caf19 +share/doc/libxml2-2.9.9/html/html/libxml-hash.html: b29d9a4775962146ba81bc5b89d54126 +share/doc/libxml2-2.9.9/html/html/libxml-lib.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/libxml-list.html: f6aa3e5c878950a036c171fc9632a362 +share/doc/libxml2-2.9.9/html/html/libxml-nanoftp.html: c07d479ce51894e6181be84cd7afc8f6 +share/doc/libxml2-2.9.9/html/html/libxml-nanohttp.html: a4457c15280d27457677a436286c344e +share/doc/libxml2-2.9.9/html/html/libxml-parser.html: d9abc1e3b231427736e24bb53d310edf +share/doc/libxml2-2.9.9/html/html/libxml-parserInternals.html: dc212b49555db1f4d3473021415990f5 +share/doc/libxml2-2.9.9/html/html/libxml-pattern.html: bff29ccd97d10d65cd40201985ba2501 +share/doc/libxml2-2.9.9/html/html/libxml-relaxng.html: da69ff4b925629ce5667c63895aecf3f +share/doc/libxml2-2.9.9/html/html/libxml-schemasInternals.html: ca466a394d9e945fcbe283d0b4a24e2f +share/doc/libxml2-2.9.9/html/html/libxml-schematron.html: f0ddff7bae5bba25b1c98abd75038c36 +share/doc/libxml2-2.9.9/html/html/libxml-threads.html: 8bfd4253309b18e5b94f01228f3c6887 +share/doc/libxml2-2.9.9/html/html/libxml-tree.html: 298516ac6d45a3439975e5de9b830a3a +share/doc/libxml2-2.9.9/html/html/libxml-uri.html: 9b4186c1502963221da42717dfcf2789 +share/doc/libxml2-2.9.9/html/html/libxml-valid.html: 51b24ec90bd3c5591130fa219172dca8 +share/doc/libxml2-2.9.9/html/html/libxml-xinclude.html: 2639d942d8a7bb71201ef35d8dd0a5d1 +share/doc/libxml2-2.9.9/html/html/libxml-xlink.html: 1de0d3b14ab220eb6b51bfa254b03769 +share/doc/libxml2-2.9.9/html/html/libxml-xmlIO.html: e9d7b75133b68febff966553614ca1e3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlautomata.html: 28a6fdabf1bcc027c5723ef484551a3b +share/doc/libxml2-2.9.9/html/html/libxml-xmlerror.html: b5130ac841f15f86cc076778451028c3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlexports.html: 76a89eb95c8256a4277f65250245ef9a +share/doc/libxml2-2.9.9/html/html/libxml-xmlmemory.html: ea097805488added49ebb2f1373c212a +share/doc/libxml2-2.9.9/html/html/libxml-xmlmodule.html: dad4c35e0c0a8fb9bc1db2d42ae5f664 +share/doc/libxml2-2.9.9/html/html/libxml-xmlreader.html: c73d0449fa012be1b45d28aabb9dd67c +share/doc/libxml2-2.9.9/html/html/libxml-xmlregexp.html: fc8289c2885a2e9adae8ce5f3f784f4d +share/doc/libxml2-2.9.9/html/html/libxml-xmlsave.html: 8e4208e2908bd9a021c31ee1338755d2 +share/doc/libxml2-2.9.9/html/html/libxml-xmlschemas.html: 455628ea9eca007ecaa224305df3b0c8 +share/doc/libxml2-2.9.9/html/html/libxml-xmlschemastypes.html: f698db4a289728d46199ad42160da1d3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlstring.html: d567835fca72a7e73875b513626e1d54 +share/doc/libxml2-2.9.9/html/html/libxml-xmlunicode.html: 7b282351048157db2233f4a8c9ed305c +share/doc/libxml2-2.9.9/html/html/libxml-xmlversion.html: d9e2cd59ac2a1aa5319d09f7ad726a63 +share/doc/libxml2-2.9.9/html/html/libxml-xmlwriter.html: f7345386e22ec21cf60d91371eeaed57 +share/doc/libxml2-2.9.9/html/html/libxml-xpath.html: 0308bfeeaa1f3f9c39d95e2015ae7157 +share/doc/libxml2-2.9.9/html/html/libxml-xpathInternals.html: f41a22321ebfed3de68cd89b8a84a118 +share/doc/libxml2-2.9.9/html/html/libxml-xpointer.html: 39926eb00e10d3513053bebbb82d015e +share/doc/libxml2-2.9.9/html/html/libxml-xzlib.html: 8d55e7cdc5a0363d945c8a672841bd6f +share/doc/libxml2-2.9.9/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 +share/doc/libxml2-2.9.9/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa +share/doc/libxml2-2.9.9/html/index.html: 854eae61c805261731f38a873415144f +share/doc/libxml2-2.9.9/html/io1.c: 8861af9d5ae163e2679d14cccd7c50a8 +share/doc/libxml2-2.9.9/html/io1.res: c1063365cedce05c3c75361d8b21eda0 +share/doc/libxml2-2.9.9/html/io2.c: 064a8c92267a391f5cbc41dbf49b14ad +share/doc/libxml2-2.9.9/html/io2.res: c6a030758261e4b23c18fe8fa9b9f1cb +share/doc/libxml2-2.9.9/html/libxml.gif: 7b77627ea524c095934962f5dee442cb +share/doc/libxml2-2.9.9/html/parse1.c: 35924de5d0e047f4e2732e8ef4d31fea +share/doc/libxml2-2.9.9/html/parse2.c: 1533aa6faa9efa078a56d2d37b4e318c +share/doc/libxml2-2.9.9/html/parse3.c: 745ea8e70138377b1fb1d0e3116dba63 +share/doc/libxml2-2.9.9/html/parse4.c: 1ebc80d9df8a1b0568f9cf7a2cc70a3e +share/doc/libxml2-2.9.9/html/reader1.c: b30f26d62bb3c37fc9cba51fff13924e +share/doc/libxml2-2.9.9/html/reader1.res: c7e547f58d4407d091d189a1ebfeab77 +share/doc/libxml2-2.9.9/html/reader2.c: 8b66731b71444ec57b99acc9d41a5f1d +share/doc/libxml2-2.9.9/html/reader3.c: 2874d5506c9f0b9f4a1dead26d58e559 +share/doc/libxml2-2.9.9/html/reader3.res: ce152220e5a24918935d6f0c8bbcf587 +share/doc/libxml2-2.9.9/html/reader4.c: c7d0e7908cfc12c1102a58f4e530bbfd +share/doc/libxml2-2.9.9/html/reader4.res: 2f8c9c74667d1434104e5610a77f824f +share/doc/libxml2-2.9.9/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 +share/doc/libxml2-2.9.9/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f +share/doc/libxml2-2.9.9/html/structure.gif: f10610a92f24c3f0fc35078f5764867e +share/doc/libxml2-2.9.9/html/test1.xml: 5ffe018a2890cdd13b4d08d674cf8dd4 +share/doc/libxml2-2.9.9/html/test2.xml: 4084cf4871ee86fef27f5e5ee91ea455 +share/doc/libxml2-2.9.9/html/test3.xml: 0ba76ca9c89e995bbaf258ab154e5205 +share/doc/libxml2-2.9.9/html/testWriter.c: 26b676b61b6f1926e5ff470395878a20 +share/doc/libxml2-2.9.9/html/tree1.c: 8e3b9f050ff7e6ecd2912940cbb2394f +share/doc/libxml2-2.9.9/html/tree1.res: 4d4d5f3e8297d35e59d9f92c876b42ac +share/doc/libxml2-2.9.9/html/tree2.c: 9896bce93692a296135127551f5b2a4b +share/doc/libxml2-2.9.9/html/tree2.res: 8e5cc417bcb23115c4f802404e09657e +share/doc/libxml2-2.9.9/html/tst.xml: 6d10ac1b8fb04bc8fb73f9964589a223 +share/doc/libxml2-2.9.9/html/tutorial/apa.html: 51b23839855ffbb232c8ba2211a4d9ca +share/doc/libxml2-2.9.9/html/tutorial/apb.html: 6fa0d1a793a7d794967c497dc9112077 +share/doc/libxml2-2.9.9/html/tutorial/apc.html: c263a905499b8177ee93b6ab39b26266 +share/doc/libxml2-2.9.9/html/tutorial/apd.html: 9f3342db337c1a28df32d4b85eba94be +share/doc/libxml2-2.9.9/html/tutorial/ape.html: 69164a2345a37ac0b1001f2084ee5abc +share/doc/libxml2-2.9.9/html/tutorial/apf.html: 4b58ea573ee05ceb46cac6c3eeef8211 +share/doc/libxml2-2.9.9/html/tutorial/apg.html: a84665f786e99169afa8e9dceb5003ca +share/doc/libxml2-2.9.9/html/tutorial/aph.html: d49dfaba969e5b9161748d98b6f8eb0b +share/doc/libxml2-2.9.9/html/tutorial/api.html: 0433fb6f377e50662e0f89b1e2f8e49a +share/doc/libxml2-2.9.9/html/tutorial/ar01s02.html: d2b5e466f1613a0a281969296efe652e +share/doc/libxml2-2.9.9/html/tutorial/ar01s03.html: af7d8b5f8bf6e7c6949c5f1b260289ef +share/doc/libxml2-2.9.9/html/tutorial/ar01s04.html: 08161b16d07d12969e2ff0db52c0006d +share/doc/libxml2-2.9.9/html/tutorial/ar01s05.html: a39259d226409f45e234b8e4f0ae1e9f +share/doc/libxml2-2.9.9/html/tutorial/ar01s06.html: 4d622cd5afe28d58e8808651c896ff1e +share/doc/libxml2-2.9.9/html/tutorial/ar01s07.html: c3d0264c72c908e119c22c7787892db9 +share/doc/libxml2-2.9.9/html/tutorial/ar01s08.html: 47bfaa87452e5e5d3436b232d96b1cf7 +share/doc/libxml2-2.9.9/html/tutorial/ar01s09.html: 066052f4864add31dffd8fc4bb1b9b7f +share/doc/libxml2-2.9.9/html/tutorial/images/blank.png: 6f7573d4bb6bf0f55ed9ebd79f3f786f +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/1.png: 0f67842b8cc059137a88288e95115a18 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/10.png: 29fd9e419eee2efa4ef6ce493ca51a9c +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/2.png: 782f998bab59d0221977c1c0eaa676c8 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/3.png: 35dcf1dd29a802080c984e52d76e5b1f +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/4.png: 3d412b47729eb73afc7aa430feeb7da0 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/5.png: 489005941fbb522369466ca850189c59 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/6.png: f64cfcfac0c4219edebc96d6d043c84c +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/7.png: 0def94f52c5e45256232320aaffeb1ce +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/8.png: 2f899cf0909049b0472654d7357eaeb3 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/9.png: 5ba16a0731d050493bd7e0b95244aafc +share/doc/libxml2-2.9.9/html/tutorial/images/caution.png: 2245032ab69fc481e2eefd246aa96e07 +share/doc/libxml2-2.9.9/html/tutorial/images/draft.png: 1b1da3ec69df05af5f2a5475e8a8a24b +share/doc/libxml2-2.9.9/html/tutorial/images/home.png: 700644702db92b31d7488edfb3adfe7e +share/doc/libxml2-2.9.9/html/tutorial/images/important.png: ca20b7b781cf82d1aeb36ce63590ccd0 +share/doc/libxml2-2.9.9/html/tutorial/images/next.png: c4ec8d7f81407ce09d175d7366c25ba0 +share/doc/libxml2-2.9.9/html/tutorial/images/note.png: 109e4af9c43357a74c6de01db819f36f +share/doc/libxml2-2.9.9/html/tutorial/images/prev.png: 2188e42454c65ed8a37126d0f5f5830a +share/doc/libxml2-2.9.9/html/tutorial/images/tip.png: dbb88aaf05b4a6a7df59c72cc5c947b4 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-blank.png: a9dfccc01739501bbc01d561da12c944 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-minus.png: 72baddf4a76d4d74f634edf1e71134b3 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-plus.png: ee8d311bafbc474875730d7644e86047 +share/doc/libxml2-2.9.9/html/tutorial/images/up.png: ddf37bee4d12f626b42004e26bdd4e13 +share/doc/libxml2-2.9.9/html/tutorial/images/warning.png: 59c28f6840b1f20094af4ffc16ce3189 +share/doc/libxml2-2.9.9/html/tutorial/includeaddattribute.c: ba57721ff902105ef3c79eb199f4da5e +share/doc/libxml2-2.9.9/html/tutorial/includeaddkeyword.c: 268f90fc598ccf5a5bd1de7d1f57c873 +share/doc/libxml2-2.9.9/html/tutorial/includeconvert.c: b91e86a449cb257dd92ada947c2b2320 +share/doc/libxml2-2.9.9/html/tutorial/includegetattribute.c: af83032a68f54f420f04430efd7629c8 +share/doc/libxml2-2.9.9/html/tutorial/includekeyword.c: 5508972bd6f704cddb4b4faeaa5397b0 +share/doc/libxml2-2.9.9/html/tutorial/includexpath.c: a9718d128b1abbf9710cb7ea315cffec +share/doc/libxml2-2.9.9/html/tutorial/index.html: c3df2af08328cd4cbf697d55ca9cd419 +share/doc/libxml2-2.9.9/html/tutorial/ix01.html: 2f9c98d5610fc9a8f02c7312c3c49691 +share/doc/libxml2-2.9.9/html/tutorial/xmltutorial.pdf: 12df01000d92ab495235de65abcd4e46 +share/doc/libxml2-2.9.9/html/w3c.png: ba69544b9cfa7659a0bb1b81410680a9 +share/doc/libxml2-2.9.9/html/writer.xml: 1e16356328b8e3fa703a18858a11f3bb +share/doc/libxml2-2.9.9/html/xml.html: 86d057e640e777486b33b7e424e0beeb +share/doc/libxml2-2.9.9/html/xpath1.c: 87445983c77091ef0441ff775fb8edc6 +share/doc/libxml2-2.9.9/html/xpath1.res: cf508aadb27c5c145ac58d256326e8eb +share/doc/libxml2-2.9.9/html/xpath2.c: 413d481a75246b5af3d8e7f489e3408f +share/doc/libxml2-2.9.9/html/xpath2.res: c32344efbb7334a5f2563420e0d1723c +share/gtk-doc/html/libxml2/general.html: df2b20bc526b927eefa3f401349d1287 +share/gtk-doc/html/libxml2/home.png: f6192f4292d744423df690e785d60fdf +share/gtk-doc/html/libxml2/index.html: b0b369ddf6959a2604b422c9268a0a3f +share/gtk-doc/html/libxml2/left.png: f771308152ab24a69682daed70ce136d +share/gtk-doc/html/libxml2/libxml2-DOCBparser.html: bde929bed90adf39144b561ad443c278 +share/gtk-doc/html/libxml2/libxml2-HTMLparser.html: b0c4afaee2ffdfb2381d66acad586e2a +share/gtk-doc/html/libxml2/libxml2-HTMLtree.html: e53dcd12a0e8e51413ca1de4986d7898 +share/gtk-doc/html/libxml2/libxml2-SAX.html: 5ba9dd3cf89972a337869e55024aeb0e +share/gtk-doc/html/libxml2/libxml2-SAX2.html: 9a8574da93ad762a54194f690db4dbee +share/gtk-doc/html/libxml2/libxml2-c14n.html: 57a9ef60a8af4df6586ab78061a75fd6 +share/gtk-doc/html/libxml2/libxml2-catalog.html: bcd705392f52867a1afadc1166739d17 +share/gtk-doc/html/libxml2/libxml2-chvalid.html: dca486d382dbf88f4d9155e3f7a826cf +share/gtk-doc/html/libxml2/libxml2-debugXML.html: efd04207438816e0ce69c47bc93e525b +share/gtk-doc/html/libxml2/libxml2-dict.html: 48012abaae77f87834377e8d4eb7caf1 +share/gtk-doc/html/libxml2/libxml2-encoding.html: d273f53a4f3c511372c5b984455f0288 +share/gtk-doc/html/libxml2/libxml2-entities.html: 3afcaf72917d0f9dda002baf4445e936 +share/gtk-doc/html/libxml2/libxml2-globals.html: 08b752bd53e687bf8ac51400c62ded68 +share/gtk-doc/html/libxml2/libxml2-hash.html: 371418533e8ef188b888d9e6e34aa245 +share/gtk-doc/html/libxml2/libxml2-list.html: 5a6fe5bf2cefe31f0f68cd2d8cafb2d7 +share/gtk-doc/html/libxml2/libxml2-nanoftp.html: 79f4eb67e7eb955c19bd5337a8cc5177 +share/gtk-doc/html/libxml2/libxml2-nanohttp.html: 0eac4dace4fda9fcd0bb2ebb6c16aaf0 +share/gtk-doc/html/libxml2/libxml2-parser.html: c3f66200ba47bd8198ec81aa3c8ce608 +share/gtk-doc/html/libxml2/libxml2-parserInternals.html: b2757ce5c41539e70df72da43af67825 +share/gtk-doc/html/libxml2/libxml2-pattern.html: 6129a6b5661fc0a38d5c967153651d26 +share/gtk-doc/html/libxml2/libxml2-relaxng.html: f98fee61d7e051dff9719e13b768b26c +share/gtk-doc/html/libxml2/libxml2-schemasInternals.html: d25db26772d036681e1299a9f214427a +share/gtk-doc/html/libxml2/libxml2-schematron.html: b3700a489202f309f02c6309f9d86984 +share/gtk-doc/html/libxml2/libxml2-threads.html: bb12a300c2c86bc49f586858a1ef6cd0 +share/gtk-doc/html/libxml2/libxml2-tree.html: 5bbe2d33f9b1917956919b7e18e47c53 +share/gtk-doc/html/libxml2/libxml2-uri.html: c46c9dfea580890ac48b70346c987bf0 +share/gtk-doc/html/libxml2/libxml2-valid.html: b4165290c6751ed9b2074eb915f0601f +share/gtk-doc/html/libxml2/libxml2-xinclude.html: 644e5093b3931eee1fece47fb9a3c908 +share/gtk-doc/html/libxml2/libxml2-xlink.html: fe35c6e86ba9419aea9f628ed45bc57a +share/gtk-doc/html/libxml2/libxml2-xmlIO.html: 1dd2f72b5a9014978f94155981fa6486 +share/gtk-doc/html/libxml2/libxml2-xmlautomata.html: 9cd301cf92ecca4ff9e896663f6d6570 +share/gtk-doc/html/libxml2/libxml2-xmlerror.html: 57549b7df0cd531b4d0ce6c03f9d9ade +share/gtk-doc/html/libxml2/libxml2-xmlexports.html: 62aebfe3442aedae77f8ff0514a8160c +share/gtk-doc/html/libxml2/libxml2-xmlmemory.html: 8c22f5ea8ddd2ed6795726d714b4ab9f +share/gtk-doc/html/libxml2/libxml2-xmlmodule.html: 215331b3567ef3b2e79cf35b1998a357 +share/gtk-doc/html/libxml2/libxml2-xmlreader.html: 512101e5eb61e5955c991e14b11ab3bd +share/gtk-doc/html/libxml2/libxml2-xmlregexp.html: 1a42a4508373992c4471d360bf1cdf4f +share/gtk-doc/html/libxml2/libxml2-xmlsave.html: ee31535906cba2ee6455e430f48eb236 +share/gtk-doc/html/libxml2/libxml2-xmlschemas.html: 55b5ed0793dd7f64e9c25cfe4be40287 +share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html: aa49b7bc4fe1493b926c035484fd77af +share/gtk-doc/html/libxml2/libxml2-xmlstring.html: 39057622b32c4f7bdb0836fd6005a1fa +share/gtk-doc/html/libxml2/libxml2-xmlunicode.html: 9ac652a74d46f8c3e1caa26c19732b2a +share/gtk-doc/html/libxml2/libxml2-xmlversion.html: 11a6e7c28ccbdbc1ca91213139decfa9 +share/gtk-doc/html/libxml2/libxml2-xmlwriter.html: 088d1735eaf6fcd0e4117c3cad0aa691 +share/gtk-doc/html/libxml2/libxml2-xpath.html: b75d3437dc3c3c355d6bace3b077e019 +share/gtk-doc/html/libxml2/libxml2-xpathInternals.html: 5f40882d1654ed5c644f22a10c8df2d3 +share/gtk-doc/html/libxml2/libxml2-xpointer.html: f1a81f0b99b0230bc0ceacae67d87043 +share/gtk-doc/html/libxml2/libxml2.devhelp: 138e3b9326546e2e347b3c0b18c12764 +share/gtk-doc/html/libxml2/right.png: ebd7e6d206d73850d77d305ab548f957 +share/gtk-doc/html/libxml2/style.css: a7b180ebf583ed0c315d70d6a4890f79 +share/gtk-doc/html/libxml2/up.png: 2f07d9272deb4ae870ca6821117877fa +share/man/man1/xml2-config.1: f9ea1b8ede868111a96fc3dbd9db79e6 +share/man/man1/xmlcatalog.1: 79205743b3bdefdddbcb175c60105cc8 +share/man/man1/xmllint.1: c2da2d5425849f19b8b0d355f5215973 +share/man/man3/libxml.3: 1bc9e496f1d34157a9e0d1b65704819a diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/4370064884cce35fe631d04efb5ff5c356ea732a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/4370064884cce35fe631d04efb5ff5c356ea732a/conanmanifest.txt new file mode 100644 index 00000000..ebd8dee8 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/4370064884cce35fe631d04efb5ff5c356ea732a/conanmanifest.txt @@ -0,0 +1,57 @@ +1563312863 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2.dll: 632148ab34c6b6cb2561f1681e22279f +bin/xmlcatalog.exe: 08d32e0db94de3b1cf466ddc7089045d +bin/xmllint.exe: 8037bc812f6015bfecbd4eb5e0f97770 +conaninfo.txt: e46ac0e8413b00cf35c221a02d466f4a +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: e3b607d4f9fb7f1efffd2a983cdd3563 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/libxml2.lib: 41f3c91f5e91295170f3d8bb407871dd +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/61072772572f3007a94ff98e7a5b24691e94f83f/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/61072772572f3007a94ff98e7a5b24691e94f83f/conanmanifest.txt new file mode 100644 index 00000000..8833c57a --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/61072772572f3007a94ff98e7a5b24691e94f83f/conanmanifest.txt @@ -0,0 +1,274 @@ +1563314249 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2-2.dll: 4a66e2fbb3e6ff0d3be4288f48ec4357 +bin/xml2-config: 76e6eed3b6f08bbd199bc8c0b7053dd5 +bin/xmlcatalog.exe: 3e562c6e39cbb4c5df1e3c0f8c413e2a +bin/xmllint.exe: dff065ca8a593135b1dfcfeb4f03326e +conaninfo.txt: 22f2906125da3c1eb305243d0f2b63bf +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: 23a57bce6575bfbeea3ce80479990313 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/cmake/libxml2/libxml2-config.cmake: 52555e668f1ac8a60ed70f97137e235b +lib/libxml2.dll.a: e98c74ae88f8c5d3cecef3bbd139beb7 +lib/pkgconfig/libxml-2.0.pc: fe998038a6721fa60055ab9cc8b32139 +lib/xml2Conf.sh: 83704a436b85808dce196ac73c3b7803 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 +share/aclocal/libxml.m4: c6969a0bf79628df8bf639433092d7b2 +share/doc/libxml2-2.9.9/Copyright: 2044417e2e5006b65a8b9067b683fcf1 +share/doc/libxml2-2.9.9/examples/testHTML.c: 6b181ebf4001bb62b07c7be7d79a2f01 +share/doc/libxml2-2.9.9/examples/testSAX.c: 34e3e9b268e1915652c15c4be11216a8 +share/doc/libxml2-2.9.9/examples/testXPath.c: 1db9d6ae0438d72387bcfd0ff1ae5ce4 +share/doc/libxml2-2.9.9/examples/xmllint.c: 15e78f93aab67d34d487eaeef8d7df22 +share/doc/libxml2-2.9.9/html/DOM.gif: b3d91cf23f7c9199b395356ea98cd097 +share/doc/libxml2-2.9.9/html/FAQ.html: 46b6bf6536bf9b2652891363aafb0b58 +share/doc/libxml2-2.9.9/html/Libxml2-Logo-180x168.gif: 6704060ba0272a9624e0a732455439ba +share/doc/libxml2-2.9.9/html/Libxml2-Logo-90x34.gif: 29dfd4b3dec5fee179d3dc7e3d65be8a +share/doc/libxml2-2.9.9/html/encoding.html: 3be0aba75968021dc9be873c020b93a9 +share/doc/libxml2-2.9.9/html/examples.xml: e94ff0f46d36f998999908d5f55cbbe9 +share/doc/libxml2-2.9.9/html/examples.xsl: 821de9e855568781f8c87ad0fe9afcba +share/doc/libxml2-2.9.9/html/html/book1.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/home.png: f6192f4292d744423df690e785d60fdf +share/doc/libxml2-2.9.9/html/html/index.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/left.png: f771308152ab24a69682daed70ce136d +share/doc/libxml2-2.9.9/html/html/libxml-DOCBparser.html: a9c425e3ab0c095b85759a321c294a72 +share/doc/libxml2-2.9.9/html/html/libxml-HTMLparser.html: 9bed50ea5f7ef6398a54151a85e5d82e +share/doc/libxml2-2.9.9/html/html/libxml-HTMLtree.html: b639bc91545a89e12d9c0a34a23bd6de +share/doc/libxml2-2.9.9/html/html/libxml-SAX.html: a1dddf7f62888196c45c587a216cbe8a +share/doc/libxml2-2.9.9/html/html/libxml-SAX2.html: 2d8812144ee7796aa073b748ba560d34 +share/doc/libxml2-2.9.9/html/html/libxml-c14n.html: af407530b72ad6d8342eab7e3d90207b +share/doc/libxml2-2.9.9/html/html/libxml-catalog.html: 6ccaf618b222577f8b1c9ed8278ea357 +share/doc/libxml2-2.9.9/html/html/libxml-chvalid.html: 4bec2549c1505b9048041b722cb052c6 +share/doc/libxml2-2.9.9/html/html/libxml-debugXML.html: b1b29857fbff5d68b7bdf982f8b9f6c7 +share/doc/libxml2-2.9.9/html/html/libxml-dict.html: 01ef47c7c40b6bcdcea9c6ee95a20780 +share/doc/libxml2-2.9.9/html/html/libxml-encoding.html: 9158690112453706058d7c502fd881e1 +share/doc/libxml2-2.9.9/html/html/libxml-entities.html: d4ae454060415d31a5eec7a09d6c05a3 +share/doc/libxml2-2.9.9/html/html/libxml-globals.html: 7487fd3b2740f53f259016b9032caf19 +share/doc/libxml2-2.9.9/html/html/libxml-hash.html: b29d9a4775962146ba81bc5b89d54126 +share/doc/libxml2-2.9.9/html/html/libxml-lib.html: 461321024ef78221594067503eb0eba0 +share/doc/libxml2-2.9.9/html/html/libxml-list.html: f6aa3e5c878950a036c171fc9632a362 +share/doc/libxml2-2.9.9/html/html/libxml-nanoftp.html: c07d479ce51894e6181be84cd7afc8f6 +share/doc/libxml2-2.9.9/html/html/libxml-nanohttp.html: a4457c15280d27457677a436286c344e +share/doc/libxml2-2.9.9/html/html/libxml-parser.html: d9abc1e3b231427736e24bb53d310edf +share/doc/libxml2-2.9.9/html/html/libxml-parserInternals.html: dc212b49555db1f4d3473021415990f5 +share/doc/libxml2-2.9.9/html/html/libxml-pattern.html: bff29ccd97d10d65cd40201985ba2501 +share/doc/libxml2-2.9.9/html/html/libxml-relaxng.html: da69ff4b925629ce5667c63895aecf3f +share/doc/libxml2-2.9.9/html/html/libxml-schemasInternals.html: ca466a394d9e945fcbe283d0b4a24e2f +share/doc/libxml2-2.9.9/html/html/libxml-schematron.html: f0ddff7bae5bba25b1c98abd75038c36 +share/doc/libxml2-2.9.9/html/html/libxml-threads.html: 8bfd4253309b18e5b94f01228f3c6887 +share/doc/libxml2-2.9.9/html/html/libxml-tree.html: 298516ac6d45a3439975e5de9b830a3a +share/doc/libxml2-2.9.9/html/html/libxml-uri.html: 9b4186c1502963221da42717dfcf2789 +share/doc/libxml2-2.9.9/html/html/libxml-valid.html: 51b24ec90bd3c5591130fa219172dca8 +share/doc/libxml2-2.9.9/html/html/libxml-xinclude.html: 2639d942d8a7bb71201ef35d8dd0a5d1 +share/doc/libxml2-2.9.9/html/html/libxml-xlink.html: 1de0d3b14ab220eb6b51bfa254b03769 +share/doc/libxml2-2.9.9/html/html/libxml-xmlIO.html: e9d7b75133b68febff966553614ca1e3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlautomata.html: 28a6fdabf1bcc027c5723ef484551a3b +share/doc/libxml2-2.9.9/html/html/libxml-xmlerror.html: b5130ac841f15f86cc076778451028c3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlexports.html: 76a89eb95c8256a4277f65250245ef9a +share/doc/libxml2-2.9.9/html/html/libxml-xmlmemory.html: ea097805488added49ebb2f1373c212a +share/doc/libxml2-2.9.9/html/html/libxml-xmlmodule.html: dad4c35e0c0a8fb9bc1db2d42ae5f664 +share/doc/libxml2-2.9.9/html/html/libxml-xmlreader.html: c73d0449fa012be1b45d28aabb9dd67c +share/doc/libxml2-2.9.9/html/html/libxml-xmlregexp.html: fc8289c2885a2e9adae8ce5f3f784f4d +share/doc/libxml2-2.9.9/html/html/libxml-xmlsave.html: 8e4208e2908bd9a021c31ee1338755d2 +share/doc/libxml2-2.9.9/html/html/libxml-xmlschemas.html: 455628ea9eca007ecaa224305df3b0c8 +share/doc/libxml2-2.9.9/html/html/libxml-xmlschemastypes.html: f698db4a289728d46199ad42160da1d3 +share/doc/libxml2-2.9.9/html/html/libxml-xmlstring.html: d567835fca72a7e73875b513626e1d54 +share/doc/libxml2-2.9.9/html/html/libxml-xmlunicode.html: 7b282351048157db2233f4a8c9ed305c +share/doc/libxml2-2.9.9/html/html/libxml-xmlversion.html: d9e2cd59ac2a1aa5319d09f7ad726a63 +share/doc/libxml2-2.9.9/html/html/libxml-xmlwriter.html: f7345386e22ec21cf60d91371eeaed57 +share/doc/libxml2-2.9.9/html/html/libxml-xpath.html: 0308bfeeaa1f3f9c39d95e2015ae7157 +share/doc/libxml2-2.9.9/html/html/libxml-xpathInternals.html: f41a22321ebfed3de68cd89b8a84a118 +share/doc/libxml2-2.9.9/html/html/libxml-xpointer.html: 39926eb00e10d3513053bebbb82d015e +share/doc/libxml2-2.9.9/html/html/libxml-xzlib.html: 8d55e7cdc5a0363d945c8a672841bd6f +share/doc/libxml2-2.9.9/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 +share/doc/libxml2-2.9.9/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa +share/doc/libxml2-2.9.9/html/index.html: 854eae61c805261731f38a873415144f +share/doc/libxml2-2.9.9/html/io1.c: 8861af9d5ae163e2679d14cccd7c50a8 +share/doc/libxml2-2.9.9/html/io1.res: c1063365cedce05c3c75361d8b21eda0 +share/doc/libxml2-2.9.9/html/io2.c: 064a8c92267a391f5cbc41dbf49b14ad +share/doc/libxml2-2.9.9/html/io2.res: c6a030758261e4b23c18fe8fa9b9f1cb +share/doc/libxml2-2.9.9/html/libxml.gif: 7b77627ea524c095934962f5dee442cb +share/doc/libxml2-2.9.9/html/parse1.c: 35924de5d0e047f4e2732e8ef4d31fea +share/doc/libxml2-2.9.9/html/parse2.c: 1533aa6faa9efa078a56d2d37b4e318c +share/doc/libxml2-2.9.9/html/parse3.c: 745ea8e70138377b1fb1d0e3116dba63 +share/doc/libxml2-2.9.9/html/parse4.c: 1ebc80d9df8a1b0568f9cf7a2cc70a3e +share/doc/libxml2-2.9.9/html/reader1.c: b30f26d62bb3c37fc9cba51fff13924e +share/doc/libxml2-2.9.9/html/reader1.res: c7e547f58d4407d091d189a1ebfeab77 +share/doc/libxml2-2.9.9/html/reader2.c: 8b66731b71444ec57b99acc9d41a5f1d +share/doc/libxml2-2.9.9/html/reader3.c: 2874d5506c9f0b9f4a1dead26d58e559 +share/doc/libxml2-2.9.9/html/reader3.res: ce152220e5a24918935d6f0c8bbcf587 +share/doc/libxml2-2.9.9/html/reader4.c: c7d0e7908cfc12c1102a58f4e530bbfd +share/doc/libxml2-2.9.9/html/reader4.res: 2f8c9c74667d1434104e5610a77f824f +share/doc/libxml2-2.9.9/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 +share/doc/libxml2-2.9.9/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f +share/doc/libxml2-2.9.9/html/structure.gif: f10610a92f24c3f0fc35078f5764867e +share/doc/libxml2-2.9.9/html/test1.xml: 5ffe018a2890cdd13b4d08d674cf8dd4 +share/doc/libxml2-2.9.9/html/test2.xml: 4084cf4871ee86fef27f5e5ee91ea455 +share/doc/libxml2-2.9.9/html/test3.xml: 0ba76ca9c89e995bbaf258ab154e5205 +share/doc/libxml2-2.9.9/html/testWriter.c: 26b676b61b6f1926e5ff470395878a20 +share/doc/libxml2-2.9.9/html/tree1.c: 8e3b9f050ff7e6ecd2912940cbb2394f +share/doc/libxml2-2.9.9/html/tree1.res: 4d4d5f3e8297d35e59d9f92c876b42ac +share/doc/libxml2-2.9.9/html/tree2.c: 9896bce93692a296135127551f5b2a4b +share/doc/libxml2-2.9.9/html/tree2.res: 8e5cc417bcb23115c4f802404e09657e +share/doc/libxml2-2.9.9/html/tst.xml: 6d10ac1b8fb04bc8fb73f9964589a223 +share/doc/libxml2-2.9.9/html/tutorial/apa.html: 51b23839855ffbb232c8ba2211a4d9ca +share/doc/libxml2-2.9.9/html/tutorial/apb.html: 6fa0d1a793a7d794967c497dc9112077 +share/doc/libxml2-2.9.9/html/tutorial/apc.html: c263a905499b8177ee93b6ab39b26266 +share/doc/libxml2-2.9.9/html/tutorial/apd.html: 9f3342db337c1a28df32d4b85eba94be +share/doc/libxml2-2.9.9/html/tutorial/ape.html: 69164a2345a37ac0b1001f2084ee5abc +share/doc/libxml2-2.9.9/html/tutorial/apf.html: 4b58ea573ee05ceb46cac6c3eeef8211 +share/doc/libxml2-2.9.9/html/tutorial/apg.html: a84665f786e99169afa8e9dceb5003ca +share/doc/libxml2-2.9.9/html/tutorial/aph.html: d49dfaba969e5b9161748d98b6f8eb0b +share/doc/libxml2-2.9.9/html/tutorial/api.html: 0433fb6f377e50662e0f89b1e2f8e49a +share/doc/libxml2-2.9.9/html/tutorial/ar01s02.html: d2b5e466f1613a0a281969296efe652e +share/doc/libxml2-2.9.9/html/tutorial/ar01s03.html: af7d8b5f8bf6e7c6949c5f1b260289ef +share/doc/libxml2-2.9.9/html/tutorial/ar01s04.html: 08161b16d07d12969e2ff0db52c0006d +share/doc/libxml2-2.9.9/html/tutorial/ar01s05.html: a39259d226409f45e234b8e4f0ae1e9f +share/doc/libxml2-2.9.9/html/tutorial/ar01s06.html: 4d622cd5afe28d58e8808651c896ff1e +share/doc/libxml2-2.9.9/html/tutorial/ar01s07.html: c3d0264c72c908e119c22c7787892db9 +share/doc/libxml2-2.9.9/html/tutorial/ar01s08.html: 47bfaa87452e5e5d3436b232d96b1cf7 +share/doc/libxml2-2.9.9/html/tutorial/ar01s09.html: 066052f4864add31dffd8fc4bb1b9b7f +share/doc/libxml2-2.9.9/html/tutorial/images/blank.png: 6f7573d4bb6bf0f55ed9ebd79f3f786f +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/1.png: 0f67842b8cc059137a88288e95115a18 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/10.png: 29fd9e419eee2efa4ef6ce493ca51a9c +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/2.png: 782f998bab59d0221977c1c0eaa676c8 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/3.png: 35dcf1dd29a802080c984e52d76e5b1f +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/4.png: 3d412b47729eb73afc7aa430feeb7da0 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/5.png: 489005941fbb522369466ca850189c59 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/6.png: f64cfcfac0c4219edebc96d6d043c84c +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/7.png: 0def94f52c5e45256232320aaffeb1ce +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/8.png: 2f899cf0909049b0472654d7357eaeb3 +share/doc/libxml2-2.9.9/html/tutorial/images/callouts/9.png: 5ba16a0731d050493bd7e0b95244aafc +share/doc/libxml2-2.9.9/html/tutorial/images/caution.png: 2245032ab69fc481e2eefd246aa96e07 +share/doc/libxml2-2.9.9/html/tutorial/images/draft.png: 1b1da3ec69df05af5f2a5475e8a8a24b +share/doc/libxml2-2.9.9/html/tutorial/images/home.png: 700644702db92b31d7488edfb3adfe7e +share/doc/libxml2-2.9.9/html/tutorial/images/important.png: ca20b7b781cf82d1aeb36ce63590ccd0 +share/doc/libxml2-2.9.9/html/tutorial/images/next.png: c4ec8d7f81407ce09d175d7366c25ba0 +share/doc/libxml2-2.9.9/html/tutorial/images/note.png: 109e4af9c43357a74c6de01db819f36f +share/doc/libxml2-2.9.9/html/tutorial/images/prev.png: 2188e42454c65ed8a37126d0f5f5830a +share/doc/libxml2-2.9.9/html/tutorial/images/tip.png: dbb88aaf05b4a6a7df59c72cc5c947b4 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-blank.png: a9dfccc01739501bbc01d561da12c944 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-minus.png: 72baddf4a76d4d74f634edf1e71134b3 +share/doc/libxml2-2.9.9/html/tutorial/images/toc-plus.png: ee8d311bafbc474875730d7644e86047 +share/doc/libxml2-2.9.9/html/tutorial/images/up.png: ddf37bee4d12f626b42004e26bdd4e13 +share/doc/libxml2-2.9.9/html/tutorial/images/warning.png: 59c28f6840b1f20094af4ffc16ce3189 +share/doc/libxml2-2.9.9/html/tutorial/includeaddattribute.c: ba57721ff902105ef3c79eb199f4da5e +share/doc/libxml2-2.9.9/html/tutorial/includeaddkeyword.c: 268f90fc598ccf5a5bd1de7d1f57c873 +share/doc/libxml2-2.9.9/html/tutorial/includeconvert.c: b91e86a449cb257dd92ada947c2b2320 +share/doc/libxml2-2.9.9/html/tutorial/includegetattribute.c: af83032a68f54f420f04430efd7629c8 +share/doc/libxml2-2.9.9/html/tutorial/includekeyword.c: 5508972bd6f704cddb4b4faeaa5397b0 +share/doc/libxml2-2.9.9/html/tutorial/includexpath.c: a9718d128b1abbf9710cb7ea315cffec +share/doc/libxml2-2.9.9/html/tutorial/index.html: c3df2af08328cd4cbf697d55ca9cd419 +share/doc/libxml2-2.9.9/html/tutorial/ix01.html: 2f9c98d5610fc9a8f02c7312c3c49691 +share/doc/libxml2-2.9.9/html/tutorial/xmltutorial.pdf: 12df01000d92ab495235de65abcd4e46 +share/doc/libxml2-2.9.9/html/w3c.png: ba69544b9cfa7659a0bb1b81410680a9 +share/doc/libxml2-2.9.9/html/writer.xml: 1e16356328b8e3fa703a18858a11f3bb +share/doc/libxml2-2.9.9/html/xml.html: 86d057e640e777486b33b7e424e0beeb +share/doc/libxml2-2.9.9/html/xpath1.c: 87445983c77091ef0441ff775fb8edc6 +share/doc/libxml2-2.9.9/html/xpath1.res: cf508aadb27c5c145ac58d256326e8eb +share/doc/libxml2-2.9.9/html/xpath2.c: 413d481a75246b5af3d8e7f489e3408f +share/doc/libxml2-2.9.9/html/xpath2.res: c32344efbb7334a5f2563420e0d1723c +share/gtk-doc/html/libxml2/general.html: df2b20bc526b927eefa3f401349d1287 +share/gtk-doc/html/libxml2/home.png: f6192f4292d744423df690e785d60fdf +share/gtk-doc/html/libxml2/index.html: b0b369ddf6959a2604b422c9268a0a3f +share/gtk-doc/html/libxml2/left.png: f771308152ab24a69682daed70ce136d +share/gtk-doc/html/libxml2/libxml2-DOCBparser.html: bde929bed90adf39144b561ad443c278 +share/gtk-doc/html/libxml2/libxml2-HTMLparser.html: b0c4afaee2ffdfb2381d66acad586e2a +share/gtk-doc/html/libxml2/libxml2-HTMLtree.html: e53dcd12a0e8e51413ca1de4986d7898 +share/gtk-doc/html/libxml2/libxml2-SAX.html: 5ba9dd3cf89972a337869e55024aeb0e +share/gtk-doc/html/libxml2/libxml2-SAX2.html: 9a8574da93ad762a54194f690db4dbee +share/gtk-doc/html/libxml2/libxml2-c14n.html: 57a9ef60a8af4df6586ab78061a75fd6 +share/gtk-doc/html/libxml2/libxml2-catalog.html: bcd705392f52867a1afadc1166739d17 +share/gtk-doc/html/libxml2/libxml2-chvalid.html: dca486d382dbf88f4d9155e3f7a826cf +share/gtk-doc/html/libxml2/libxml2-debugXML.html: efd04207438816e0ce69c47bc93e525b +share/gtk-doc/html/libxml2/libxml2-dict.html: 48012abaae77f87834377e8d4eb7caf1 +share/gtk-doc/html/libxml2/libxml2-encoding.html: d273f53a4f3c511372c5b984455f0288 +share/gtk-doc/html/libxml2/libxml2-entities.html: 3afcaf72917d0f9dda002baf4445e936 +share/gtk-doc/html/libxml2/libxml2-globals.html: 08b752bd53e687bf8ac51400c62ded68 +share/gtk-doc/html/libxml2/libxml2-hash.html: 371418533e8ef188b888d9e6e34aa245 +share/gtk-doc/html/libxml2/libxml2-list.html: 5a6fe5bf2cefe31f0f68cd2d8cafb2d7 +share/gtk-doc/html/libxml2/libxml2-nanoftp.html: 79f4eb67e7eb955c19bd5337a8cc5177 +share/gtk-doc/html/libxml2/libxml2-nanohttp.html: 0eac4dace4fda9fcd0bb2ebb6c16aaf0 +share/gtk-doc/html/libxml2/libxml2-parser.html: c3f66200ba47bd8198ec81aa3c8ce608 +share/gtk-doc/html/libxml2/libxml2-parserInternals.html: b2757ce5c41539e70df72da43af67825 +share/gtk-doc/html/libxml2/libxml2-pattern.html: 6129a6b5661fc0a38d5c967153651d26 +share/gtk-doc/html/libxml2/libxml2-relaxng.html: f98fee61d7e051dff9719e13b768b26c +share/gtk-doc/html/libxml2/libxml2-schemasInternals.html: d25db26772d036681e1299a9f214427a +share/gtk-doc/html/libxml2/libxml2-schematron.html: b3700a489202f309f02c6309f9d86984 +share/gtk-doc/html/libxml2/libxml2-threads.html: bb12a300c2c86bc49f586858a1ef6cd0 +share/gtk-doc/html/libxml2/libxml2-tree.html: 5bbe2d33f9b1917956919b7e18e47c53 +share/gtk-doc/html/libxml2/libxml2-uri.html: c46c9dfea580890ac48b70346c987bf0 +share/gtk-doc/html/libxml2/libxml2-valid.html: b4165290c6751ed9b2074eb915f0601f +share/gtk-doc/html/libxml2/libxml2-xinclude.html: 644e5093b3931eee1fece47fb9a3c908 +share/gtk-doc/html/libxml2/libxml2-xlink.html: fe35c6e86ba9419aea9f628ed45bc57a +share/gtk-doc/html/libxml2/libxml2-xmlIO.html: 1dd2f72b5a9014978f94155981fa6486 +share/gtk-doc/html/libxml2/libxml2-xmlautomata.html: 9cd301cf92ecca4ff9e896663f6d6570 +share/gtk-doc/html/libxml2/libxml2-xmlerror.html: 57549b7df0cd531b4d0ce6c03f9d9ade +share/gtk-doc/html/libxml2/libxml2-xmlexports.html: 62aebfe3442aedae77f8ff0514a8160c +share/gtk-doc/html/libxml2/libxml2-xmlmemory.html: 8c22f5ea8ddd2ed6795726d714b4ab9f +share/gtk-doc/html/libxml2/libxml2-xmlmodule.html: 215331b3567ef3b2e79cf35b1998a357 +share/gtk-doc/html/libxml2/libxml2-xmlreader.html: 512101e5eb61e5955c991e14b11ab3bd +share/gtk-doc/html/libxml2/libxml2-xmlregexp.html: 1a42a4508373992c4471d360bf1cdf4f +share/gtk-doc/html/libxml2/libxml2-xmlsave.html: ee31535906cba2ee6455e430f48eb236 +share/gtk-doc/html/libxml2/libxml2-xmlschemas.html: 55b5ed0793dd7f64e9c25cfe4be40287 +share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html: aa49b7bc4fe1493b926c035484fd77af +share/gtk-doc/html/libxml2/libxml2-xmlstring.html: 39057622b32c4f7bdb0836fd6005a1fa +share/gtk-doc/html/libxml2/libxml2-xmlunicode.html: 9ac652a74d46f8c3e1caa26c19732b2a +share/gtk-doc/html/libxml2/libxml2-xmlversion.html: 11a6e7c28ccbdbc1ca91213139decfa9 +share/gtk-doc/html/libxml2/libxml2-xmlwriter.html: 088d1735eaf6fcd0e4117c3cad0aa691 +share/gtk-doc/html/libxml2/libxml2-xpath.html: b75d3437dc3c3c355d6bace3b077e019 +share/gtk-doc/html/libxml2/libxml2-xpathInternals.html: 5f40882d1654ed5c644f22a10c8df2d3 +share/gtk-doc/html/libxml2/libxml2-xpointer.html: f1a81f0b99b0230bc0ceacae67d87043 +share/gtk-doc/html/libxml2/libxml2.devhelp: 138e3b9326546e2e347b3c0b18c12764 +share/gtk-doc/html/libxml2/right.png: ebd7e6d206d73850d77d305ab548f957 +share/gtk-doc/html/libxml2/style.css: a7b180ebf583ed0c315d70d6a4890f79 +share/gtk-doc/html/libxml2/up.png: 2f07d9272deb4ae870ca6821117877fa +share/man/man1/xml2-config.1: f9ea1b8ede868111a96fc3dbd9db79e6 +share/man/man1/xmlcatalog.1: 79205743b3bdefdddbcb175c60105cc8 +share/man/man1/xmllint.1: c2da2d5425849f19b8b0d355f5215973 +share/man/man3/libxml.3: 1bc9e496f1d34157a9e0d1b65704819a diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/a2f0cba83ce6faca8664d5e4c043b89cb0b7bfe2/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/a2f0cba83ce6faca8664d5e4c043b89cb0b7bfe2/conanmanifest.txt new file mode 100644 index 00000000..5bc2a52a --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/a2f0cba83ce6faca8664d5e4c043b89cb0b7bfe2/conanmanifest.txt @@ -0,0 +1,57 @@ +1563312673 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2.dll: 36f09f1647f79bbcd6fb83990e7556d6 +bin/xmlcatalog.exe: aece355d60e23820db6b8a8f5398926b +bin/xmllint.exe: 5b4c66ea7fd3eded27162c6a264168d6 +conaninfo.txt: 2f9e27dac66da907585431bf3e1cd5cd +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: e3b607d4f9fb7f1efffd2a983cdd3563 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/libxml2.lib: 3298f82644251a34bd95fbd900087e19 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/c837186703e4fb24344e99222c6f8da4a8574e49/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/c837186703e4fb24344e99222c6f8da4a8574e49/conanmanifest.txt new file mode 100644 index 00000000..1c0f5276 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.9/qtproject/stable/package/c837186703e4fb24344e99222c6f8da4a8574e49/conanmanifest.txt @@ -0,0 +1,57 @@ +1563312495 +FindLibXml2.cmake: d030bc3535551b29c75e192b74469347 +bin/libxml2.dll: b028a505c7edcec4b7ee8e1a4d49a846 +bin/xmlcatalog.exe: c6047d4112de01e2da37c1c591c9a451 +bin/xmllint.exe: 47b08028082138743437c8bcd9e4fa2a +conaninfo.txt: 70025695045214886ea8bb78eb461369 +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f +include/libxml2/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: 93b78165ce896cbda4417bd278259714 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: 35f22cf7568b12fcf7bdc3f47fe2ccca +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034 +include/libxml2/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 57e07ffffb72ccfa3ef131c7ad89633a +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 7e730a421411d4d34ad95b52122f2650 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49 +include/libxml2/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975 +include/libxml2/libxml/xmlexports.h: 600bbe5e56f034234213b0c0bf36f2b9 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: e3b607d4f9fb7f1efffd2a983cdd3563 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: 117c7e9cb4e95acd6648f4af9cf98c5b +include/libxml2/wsockcompat.h: 04a6c8ece3e62ee924d3653c2613b5be +lib/libxml2.lib: 80971fc22fe9830afe2ec26e2f0e1597 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index 73d392f3..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1478799778 -conanfile.py: b879c8be77c29214d239564bf9d04969 \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt deleted file mode 100644 index ead7f1ca..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt +++ /dev/null @@ -1,136 +0,0 @@ -1478799864 -bin/libexslt-0.dll: 7675292df50bf7e337e6fe7641612f2b -bin/libxslt-1.dll: a1c6847bea36a592e198604f930974d2 -bin/xslt-config: 92edf713575aac5c5db15127af375842 -bin/xsltproc.exe: c215ee880a249a87c6eab40d5a9660e3 -conaninfo.txt: d4dddabb56f9b9605df4d8fa2f367028 -include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 -include/libexslt/exsltconfig.h: b3e4cceec1495ff23ba07518c4a8afcb -include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 -include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f -include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f -include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a -include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 -include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3 -include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0 -include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 -include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e -include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f -include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b -include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 -include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f -include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 -include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 -include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac -include/libxslt/transform.h: 060c2e753adea589569d2835a006075e -include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 -include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c -include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661 -include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 -include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 -include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e -include/libxslt/xsltconfig.h: 696ee4c678ac92cb4b17a955475698b0 -include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 -include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 -include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -lib/libexslt.dll.a: c03cb36bcefbeaf9f2529dcae7d38db5 -lib/libexslt.la: 4e7f084a461a3ab245dce1836aaf4384 -lib/libxslt.dll.a: 3dca0c97875f4f44cf46039657d5f5eb -lib/libxslt.la: 04ac200e9b2c56292ad91ffcb83ff676 -lib/pkgconfig/libexslt.pc: 6ae3965889e819ace738967546160ede -lib/pkgconfig/libxslt.pc: 101abf476285d150fb6130679868fd2a -lib/xsltConf.sh: 387130017807ac4132eccf4db20b3be8 -share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 -share/doc/libxslt-1.1.29/html/API.html: 99b964a0e24da7db2d479302fbde49ef -share/doc/libxslt-1.1.29/html/APIchunk0.html: 379e5dd4f4ae9cdbaea4428322524d23 -share/doc/libxslt-1.1.29/html/APIchunk1.html: e6bedc4a557c35709cfaadb3b3a2c78e -share/doc/libxslt-1.1.29/html/APIchunk10.html: 990d5445086a566dff80c3c55e7fe777 -share/doc/libxslt-1.1.29/html/APIchunk11.html: d2c1db9800e2fefec12d29d1d4935787 -share/doc/libxslt-1.1.29/html/APIchunk12.html: 3e91f14eb29aa1b149a6dc47adfe3f7e -share/doc/libxslt-1.1.29/html/APIchunk13.html: f81829102703ab031d34501e86c38de6 -share/doc/libxslt-1.1.29/html/APIchunk2.html: 8de13f862400c55f79640149263ecdf2 -share/doc/libxslt-1.1.29/html/APIchunk3.html: a67b4125d6d62adefd42a1f14d8e743e -share/doc/libxslt-1.1.29/html/APIchunk4.html: 56f35b492dacfd056fb9aeb0d465d4d8 -share/doc/libxslt-1.1.29/html/APIchunk5.html: a0fd3189be50ea1bd6193387408f586c -share/doc/libxslt-1.1.29/html/APIchunk6.html: 9bbcf809a505e114d6639124cf4ea61c -share/doc/libxslt-1.1.29/html/APIchunk7.html: a13a001cbc5772a5f078dcb6b6933ed7 -share/doc/libxslt-1.1.29/html/APIchunk8.html: bcffc0a904c0e63029ea40434087e8a6 -share/doc/libxslt-1.1.29/html/APIchunk9.html: ed227fe1b81942da23d7e2aa7b743888 -share/doc/libxslt-1.1.29/html/APIconstructors.html: d79268dc83d0336691469ee5e7de4ffa -share/doc/libxslt-1.1.29/html/APIfiles.html: 490ec3f50d79908176cd61723381ebdf -share/doc/libxslt-1.1.29/html/APIfunctions.html: 78ba3e4807646ecedb871570caecf6d2 -share/doc/libxslt-1.1.29/html/APIsymbols.html: 3e7d7df3374823ed4a8b9e00de152f5e -share/doc/libxslt-1.1.29/html/EXSLT/APIchunk0.html: be037131987b78b19b9e61ce54877bee -share/doc/libxslt-1.1.29/html/EXSLT/APIconstructors.html: 3da084171718dfe3cfc77c6d4350762f -share/doc/libxslt-1.1.29/html/EXSLT/APIfiles.html: d67a66297a2fd601bc1553874765a315 -share/doc/libxslt-1.1.29/html/EXSLT/APIfunctions.html: 6b0b4b814785deca06fb32b27d1421db -share/doc/libxslt-1.1.29/html/EXSLT/APIsymbols.html: 39928a27a9ada210627deef998899296 -share/doc/libxslt-1.1.29/html/EXSLT/bugs.html: 7e22e19ae460ec6a27849b6bf2870eaf -share/doc/libxslt-1.1.29/html/EXSLT/docs.html: de04679a46246ab14183bfddfb9fe21e -share/doc/libxslt-1.1.29/html/EXSLT/downloads.html: 775d1c9006018e2a6afbd46aabac94cc -share/doc/libxslt-1.1.29/html/EXSLT/exslt.html: 9f53a9098c0ae4b86092ec453f9bf5e0 -share/doc/libxslt-1.1.29/html/EXSLT/help.html: 6a3ae7a677b508299d6843ec2aa06919 -share/doc/libxslt-1.1.29/html/EXSLT/index.html: f10878530c0c370434e38f8669b87fb2 -share/doc/libxslt-1.1.29/html/EXSLT/intro.html: 08c5743544fa11d3e47794d2bddf58c5 -share/doc/libxslt-1.1.29/html/FAQ.html: d50bcf8a29a1593dd5e0a3821071274f -share/doc/libxslt-1.1.29/html/Libxslt-Logo-180x168.gif: e6f8bb7e4a5a426380d387adaedadad9 -share/doc/libxslt-1.1.29/html/Libxslt-Logo-90x34.gif: 6b3ac58ce6c3e622db3dbf83d127f1ac -share/doc/libxslt-1.1.29/html/bugs.html: f724ff1f191cd6d6006ff81f85b84987 -share/doc/libxslt-1.1.29/html/contexts.gif: 8d882ee509aaba54abf791a312fdb617 -share/doc/libxslt-1.1.29/html/contribs.html: c3d4e7a850f0d5e373f857093b092fbc -share/doc/libxslt-1.1.29/html/docbook.html: 776f814590907d566008cb194162da1a -share/doc/libxslt-1.1.29/html/docs.html: 4291a6eb59ef115310843882330d25f1 -share/doc/libxslt-1.1.29/html/downloads.html: a34b24da9c37d11b160a51375b2d8e26 -share/doc/libxslt-1.1.29/html/extensions.html: d9dc8d45c36e77af9b229d9de2fa184c -share/doc/libxslt-1.1.29/html/help.html: ec0ba42602368c606bb282ae37d6e8ff -share/doc/libxslt-1.1.29/html/html/book1.html: 38e702d7abb51be701e9e4a132b7fbf3 -share/doc/libxslt-1.1.29/html/html/home.png: f6192f4292d744423df690e785d60fdf -share/doc/libxslt-1.1.29/html/html/index.html: 38e702d7abb51be701e9e4a132b7fbf3 -share/doc/libxslt-1.1.29/html/html/left.png: f771308152ab24a69682daed70ce136d -share/doc/libxslt-1.1.29/html/html/libxslt-attributes.html: 01e3dad54911c715af8eb4edd03680d7 -share/doc/libxslt-1.1.29/html/html/libxslt-documents.html: 04b4f566bc179282ba31e4086733d392 -share/doc/libxslt-1.1.29/html/html/libxslt-extensions.html: 48ba473ecaca35f0e9d118bfe569a4ce -share/doc/libxslt-1.1.29/html/html/libxslt-extra.html: b531cac2627f78c17bf7751d709d15e4 -share/doc/libxslt-1.1.29/html/html/libxslt-functions.html: 8f859868f4d61cc91fc3297f58cf467f -share/doc/libxslt-1.1.29/html/html/libxslt-imports.html: b190003ede5181d38069a360e9e54696 -share/doc/libxslt-1.1.29/html/html/libxslt-keys.html: 595c6d8e3cbd5836d765a714cdaa8662 -share/doc/libxslt-1.1.29/html/html/libxslt-lib.html: 38e702d7abb51be701e9e4a132b7fbf3 -share/doc/libxslt-1.1.29/html/html/libxslt-namespaces.html: f1957f303bf803b546fea20c3210e66c -share/doc/libxslt-1.1.29/html/html/libxslt-numbersInternals.html: 8270d01773d6827cef5eb0e5fbc06cbe -share/doc/libxslt-1.1.29/html/html/libxslt-pattern.html: 68a6e5041985bd90b062f225d3e4a4ea -share/doc/libxslt-1.1.29/html/html/libxslt-preproc.html: 2e5b3d40d10b5d19f8d8981890fa60e6 -share/doc/libxslt-1.1.29/html/html/libxslt-security.html: 0fc54dbb04c31db7273540c6aa15b789 -share/doc/libxslt-1.1.29/html/html/libxslt-templates.html: f795df05f5ada549196b3b0af2b51b6f -share/doc/libxslt-1.1.29/html/html/libxslt-transform.html: 10347ce214f564ed64480e3a29629bce -share/doc/libxslt-1.1.29/html/html/libxslt-variables.html: 78a0a52b6df345ecda47c06da8ac8d58 -share/doc/libxslt-1.1.29/html/html/libxslt-xslt.html: e94fba7be3d50049b723a80d3b0a1b40 -share/doc/libxslt-1.1.29/html/html/libxslt-xsltInternals.html: 4fc3053cfdc99227025f82dd83b99059 -share/doc/libxslt-1.1.29/html/html/libxslt-xsltexports.html: 21afd523be589d91dac3cdd1692d434c -share/doc/libxslt-1.1.29/html/html/libxslt-xsltlocale.html: 8a6973315db00ad07f270a50fb864ff1 -share/doc/libxslt-1.1.29/html/html/libxslt-xsltutils.html: 25ce5faa616e42268d54a34cb5983e5c -share/doc/libxslt-1.1.29/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 -share/doc/libxslt-1.1.29/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa -share/doc/libxslt-1.1.29/html/index.html: 05e32435399ac231b17cd820de78ac70 -share/doc/libxslt-1.1.29/html/internals.html: 922c61987ad85ba31859d1fa36ca2fc2 -share/doc/libxslt-1.1.29/html/intro.html: f7674ee30704647018c1cdd5ffa4b56f -share/doc/libxslt-1.1.29/html/news.html: 7deecee24a4b90b4e4c88f0d299f090f -share/doc/libxslt-1.1.29/html/node.gif: e0b48d09fa64e4a64831c42c4f9e6331 -share/doc/libxslt-1.1.29/html/object.gif: 879905dbfdc584f7a8543b7804cc3ff4 -share/doc/libxslt-1.1.29/html/processing.gif: e6924e110962e92a04d6d3f1f1196b31 -share/doc/libxslt-1.1.29/html/python.html: c8c7fafbda61cd06c188c4cceb78184e -share/doc/libxslt-1.1.29/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 -share/doc/libxslt-1.1.29/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f -share/doc/libxslt-1.1.29/html/stylesheet.gif: 15a7ac6844ef2b2a7f601ed6cb6cb277 -share/doc/libxslt-1.1.29/html/templates.gif: e1ac04018d8f602adbd28a72153f9956 -share/doc/libxslt-1.1.29/html/tutorial/libxslt_tutorial.c: 0c3d2acbfb0be23b984c695600170d16 -share/doc/libxslt-1.1.29/html/tutorial/libxslttutorial.html: ee8ec694b4a88c4b6503f5301c998ecd -share/doc/libxslt-1.1.29/html/tutorial/libxslttutorial.xml: 7f3bb19c2dcc54c5f76e953a65dbd339 -share/doc/libxslt-1.1.29/html/tutorial2/libxslt_pipes.c: 01a91d21b5e9a1e2259752d5325feaf0 -share/doc/libxslt-1.1.29/html/tutorial2/libxslt_pipes.html: ac0dc678b3ab0da56681555c51e6fa64 -share/doc/libxslt-1.1.29/html/tutorial2/libxslt_pipes.xml: 0c0faafe5595b19ebe09f6110fe3a7fd -share/doc/libxslt-1.1.29/html/xslt.html: 739e6a1bf660969174feb4db301f3e80 -share/doc/libxslt-1.1.29/html/xsltproc.html: fa713b8a3fd6b30a19319a821d7bb238 -share/doc/libxslt-1.1.29/html/xsltproc2.html: 52997d42ce172e9b1cace319bb5aaa0b -share/man/man1/xsltproc.1: be3aaba050a613d185ab69a1547eeee1 -share/man/man3/libexslt.3: c7089bab11720e9c9c17962a68c528ff -share/man/man3/libxslt.3: e4962632ed2590adad3621054417bd2a \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index de2aa3a0..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1482494842 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt deleted file mode 100644 index 0820b583..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt +++ /dev/null @@ -1,38 +0,0 @@ -1482494796 -bin/libexslt.dll: acf1f58607eb1a10534cc30ca2bf2c9f -bin/libxslt.dll: 9edc15648704934221ec3afcedb25451 -conaninfo.txt: 224814c47f7d14968c401d2180974e77 -include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 -include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 -include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 -include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f -include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f -include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a -include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 -include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3 -include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0 -include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 -include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e -include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f -include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b -include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 -include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f -include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 -include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 -include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac -include/libxslt/transform.h: 060c2e753adea589569d2835a006075e -include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 -include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c -include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661 -include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 -include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 -include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e -include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7 -include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 -include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 -include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: 0c9f94aeea183a48ec62d6e1a3ac42af -lib/libexslt_a.lib: 026a42ff0b36660c1bd4890b656c80ee -lib/libxslt.lib: 084d078777bf34d52af7fc93a425d6b0 -lib/libxslt_a.lib: a07434cb5a40a32a17be58f71fe24976 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt deleted file mode 100644 index 22a7c428..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt +++ /dev/null @@ -1,38 +0,0 @@ -1482494566 -bin/libexslt.dll: 656ebfef4dcd7d299bff8f5123bfd4b9 -bin/libxslt.dll: cdca16a3183ddcbdf3d0087c3f1e62e9 -conaninfo.txt: 73548fb3ff61aade734c0ce2071a2d05 -include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 -include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 -include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 -include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f -include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f -include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a -include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 -include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3 -include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0 -include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 -include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e -include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f -include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b -include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 -include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f -include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 -include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 -include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac -include/libxslt/transform.h: 060c2e753adea589569d2835a006075e -include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 -include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c -include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661 -include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 -include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 -include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e -include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7 -include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 -include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 -include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: a84716fa57d325856a55cf5ba8a816c6 -lib/libexslt_a.lib: c428937c93542c6386534b61239e8119 -lib/libxslt.lib: 43b2e966367546ff110762f24f4c919d -lib/libxslt_a.lib: a802233763886894a7a89e4f8e634e6a diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt deleted file mode 100644 index 0501df3e..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt +++ /dev/null @@ -1,38 +0,0 @@ -1499348623 -bin/libexslt.dll: 27d2ff4cdff16eb9dd4944ef27cb467a -bin/libxslt.dll: b33bd4f30819263259ab52ee0cd9b7ff -conaninfo.txt: 00cd7d1f6493ac337bb709aedcabcc77 -include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 -include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 -include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 -include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f -include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f -include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a -include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 -include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3 -include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0 -include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 -include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e -include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f -include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b -include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 -include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f -include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 -include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 -include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac -include/libxslt/transform.h: 060c2e753adea589569d2835a006075e -include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 -include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c -include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661 -include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 -include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 -include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e -include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7 -include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 -include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 -include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: c491b1f54d162d9d5d42271d49315fee -lib/libexslt_a.lib: 7be28465f2df067865a4edd9a70fca92 -lib/libxslt.lib: 5392c2fe22b1ee711bd469eb1cfdceae -lib/libxslt_a.lib: 8f62e865d164a187b5b8c43d07315363 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt deleted file mode 100644 index db328396..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt +++ /dev/null @@ -1,38 +0,0 @@ -1499348859 -bin/libexslt.dll: d2372193eb260a7b2351402a8e14b0f8 -bin/libxslt.dll: 9f8883be8f7b3df46f0d7b1c6312e191 -conaninfo.txt: fab5795c699ab977ff1852840f4d1c77 -include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 -include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 -include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 -include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f -include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f -include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a -include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 -include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3 -include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0 -include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 -include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e -include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f -include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b -include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 -include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f -include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 -include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 -include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac -include/libxslt/transform.h: 060c2e753adea589569d2835a006075e -include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 -include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c -include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661 -include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 -include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 -include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e -include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7 -include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 -include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 -include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: 0c2503b1eca0a09387fda8cc216dd487 -lib/libexslt_a.lib: 24a3c1b936b7433a786954203dea83cd -lib/libxslt.lib: bfbf055a6a5fb8aa246bf4b094669fd9 -lib/libxslt_a.lib: 49538c60313cbfc216007fa1ec3fc6a7 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..fca5f192 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,3 @@ +1563314340 +LICENSE.md: 5aa9930034582b90e2008d2c609d1317 +conanfile.py: 85aee547c18dc9922ef9b56faf3e7a07 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt new file mode 100644 index 00000000..33da41c9 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt @@ -0,0 +1,39 @@ +1563314516 +bin/libexslt.dll: 1027ae276703fdb975b78af97f50a3fd +bin/libxslt.dll: 5fbe99fe4c940217a9a18593b3580701 +bin/xsltproc.exe: 7b2a42162459c1b506d563c6fb449afd +conaninfo.txt: 131c2efa982318cd7b48007ceedd90c2 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.lib: 2de6293c1989c7ff270db23f2a51027f +lib/libexslt_a.lib: c5887a724f9ca61adfcff43ea3510432 +lib/libxslt.lib: ae3fb6fd41bcc83e99eb833d7f11312c +lib/libxslt_a.lib: 5b6184ab67226653a619992d2e66d30a +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt new file mode 100644 index 00000000..655972a0 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt @@ -0,0 +1,39 @@ +1563314384 +bin/libexslt.dll: e0f8b366523f930466733da6b10c8477 +bin/libxslt.dll: f00b9c502cc7a684a7f479a8f7500ee8 +bin/xsltproc.exe: a4517cf3425c2240a9a1656cac8b0d61 +conaninfo.txt: 4ec410e069cb83d8a1364e503ef5e869 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.lib: 62a9bb46b41162952efeaa60ef7bab1c +lib/libexslt_a.lib: c92bb2cea4ca81635b84f156c05ec86d +lib/libxslt.lib: a8b2e5f594f4b9c0b685dd742778fcc7 +lib/libxslt_a.lib: 8448d05a7195909bbabbe069855fc9b9 +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt new file mode 100644 index 00000000..c36a1022 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt @@ -0,0 +1,39 @@ +1563314840 +bin/libexslt.dll: 4141dfa25d865a0cee1b59fe424acc3d +bin/libxslt.dll: 43556087a0f9ef6644fedb03b7a0b290 +bin/xsltproc.exe: 777526f819fe1316100b90b29d442bae +conaninfo.txt: 9215fe709c0363a6446192bdbf7be8b0 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.lib: a6856e7a6c5bf5a3219d20f6a4196af7 +lib/libexslt_a.lib: a8c039f9ec02c10bbe0b4e7d7b64c7c2 +lib/libxslt.lib: c92f8017146bd83d247fa2923fefad40 +lib/libxslt_a.lib: 35d4de952df68733c2e4d483cc60ab9a +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt new file mode 100644 index 00000000..a931af23 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt @@ -0,0 +1,131 @@ +1563315535 +bin/libexslt-0.dll: cab6eb3a57d592d0c6556772e75bc091 +bin/libxslt-1.dll: 1b237a7dca37e8be1a2b7644b4e32f2a +bin/xslt-config: 40811a2730bb0b6542758cff609476a4 +bin/xsltproc.exe: 7f47496605bb3c31198b2028295e41cb +conaninfo.txt: 98809b81082a2638531dca7c3c6b8196 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: 0ecd038f6193e48046754b4c19c5100a +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: 05fef7eabdf530bd4187f2ab36f75ab2 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.dll.a: 83bc04597cc3a197ad757f5a76cd3cf8 +lib/libexslt.la: 0cb3b2219e4d584e600e7c8c2793c17f +lib/libxslt.dll.a: 7e6d45f7f66e7095e0706a8cb487b2ad +lib/pkgconfig/libexslt.pc: bf17f17059d9835bd023402072aae276 +lib/pkgconfig/libxslt.pc: d44ef86e4b636bfdb470a0abac21ea2c +lib/xsltConf.sh: 6592ea47fbdda09eda481af47695c07e +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 +share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 +share/doc/libxslt-1.1.33/html/API.html: 99b964a0e24da7db2d479302fbde49ef +share/doc/libxslt-1.1.33/html/APIchunk0.html: 2606a248a6bcc15dc3a0a7b24aa4c986 +share/doc/libxslt-1.1.33/html/APIchunk1.html: b7d490ac26795f95c2bef95c0a594602 +share/doc/libxslt-1.1.33/html/APIchunk10.html: 21469e5e8bddfc34612199bcbe475986 +share/doc/libxslt-1.1.33/html/APIchunk11.html: d885dc364ca2e7f673e70a8e4bebe708 +share/doc/libxslt-1.1.33/html/APIchunk12.html: bf1786a4eec69d7f07b1b343e5896578 +share/doc/libxslt-1.1.33/html/APIchunk13.html: a6260a4828dede37e72fcba0b0896bbc +share/doc/libxslt-1.1.33/html/APIchunk2.html: d23cc069d98f804c94b5f89d689df18d +share/doc/libxslt-1.1.33/html/APIchunk3.html: 726cc909e934c30b155938c7e3054514 +share/doc/libxslt-1.1.33/html/APIchunk4.html: 6ae81594249831b8fb705cf93e2aeb1c +share/doc/libxslt-1.1.33/html/APIchunk5.html: abec4cefc8e617a8a5a09a4eb698f1b2 +share/doc/libxslt-1.1.33/html/APIchunk6.html: fbf021be7dc8290f2e982f142db88c65 +share/doc/libxslt-1.1.33/html/APIchunk7.html: 8a239dc2258366ba021dff7da5bff984 +share/doc/libxslt-1.1.33/html/APIchunk8.html: 477f0b927ea36d2b304b4d9cc50c1d33 +share/doc/libxslt-1.1.33/html/APIchunk9.html: 6a3e5b1297a1ac42a923be4572e910b1 +share/doc/libxslt-1.1.33/html/APIconstructors.html: 024a521581bd48526c32d53ad523ca7d +share/doc/libxslt-1.1.33/html/APIfiles.html: 5d7c6992d4f45cc688140d67c1c36819 +share/doc/libxslt-1.1.33/html/APIfunctions.html: 3507a0636b416c3d0e26d751ffbc89b4 +share/doc/libxslt-1.1.33/html/APIsymbols.html: b4e69e2a3f573e06627682607098e7d5 +share/doc/libxslt-1.1.33/html/EXSLT/APIchunk0.html: be037131987b78b19b9e61ce54877bee +share/doc/libxslt-1.1.33/html/EXSLT/APIconstructors.html: 3da084171718dfe3cfc77c6d4350762f +share/doc/libxslt-1.1.33/html/EXSLT/APIfiles.html: d67a66297a2fd601bc1553874765a315 +share/doc/libxslt-1.1.33/html/EXSLT/APIfunctions.html: 6b0b4b814785deca06fb32b27d1421db +share/doc/libxslt-1.1.33/html/EXSLT/APIsymbols.html: 39928a27a9ada210627deef998899296 +share/doc/libxslt-1.1.33/html/EXSLT/bugs.html: 7e22e19ae460ec6a27849b6bf2870eaf +share/doc/libxslt-1.1.33/html/EXSLT/docs.html: de04679a46246ab14183bfddfb9fe21e +share/doc/libxslt-1.1.33/html/EXSLT/downloads.html: 775d1c9006018e2a6afbd46aabac94cc +share/doc/libxslt-1.1.33/html/EXSLT/exslt.html: 506581c3f25d8dbc5443c8892dfd09fe +share/doc/libxslt-1.1.33/html/EXSLT/help.html: 6a3ae7a677b508299d6843ec2aa06919 +share/doc/libxslt-1.1.33/html/EXSLT/index.html: f10878530c0c370434e38f8669b87fb2 +share/doc/libxslt-1.1.33/html/EXSLT/intro.html: 08c5743544fa11d3e47794d2bddf58c5 +share/doc/libxslt-1.1.33/html/FAQ.html: d50bcf8a29a1593dd5e0a3821071274f +share/doc/libxslt-1.1.33/html/Libxslt-Logo-180x168.gif: e6f8bb7e4a5a426380d387adaedadad9 +share/doc/libxslt-1.1.33/html/Libxslt-Logo-90x34.gif: 6b3ac58ce6c3e622db3dbf83d127f1ac +share/doc/libxslt-1.1.33/html/bugs.html: f724ff1f191cd6d6006ff81f85b84987 +share/doc/libxslt-1.1.33/html/contexts.gif: 8d882ee509aaba54abf791a312fdb617 +share/doc/libxslt-1.1.33/html/contribs.html: c3d4e7a850f0d5e373f857093b092fbc +share/doc/libxslt-1.1.33/html/docbook.html: 776f814590907d566008cb194162da1a +share/doc/libxslt-1.1.33/html/docs.html: 4291a6eb59ef115310843882330d25f1 +share/doc/libxslt-1.1.33/html/downloads.html: a34b24da9c37d11b160a51375b2d8e26 +share/doc/libxslt-1.1.33/html/extensions.html: d9dc8d45c36e77af9b229d9de2fa184c +share/doc/libxslt-1.1.33/html/help.html: ec0ba42602368c606bb282ae37d6e8ff +share/doc/libxslt-1.1.33/html/html/book1.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/home.png: f6192f4292d744423df690e785d60fdf +share/doc/libxslt-1.1.33/html/html/index.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/left.png: f771308152ab24a69682daed70ce136d +share/doc/libxslt-1.1.33/html/html/libxslt-attributes.html: 01e3dad54911c715af8eb4edd03680d7 +share/doc/libxslt-1.1.33/html/html/libxslt-documents.html: 04b4f566bc179282ba31e4086733d392 +share/doc/libxslt-1.1.33/html/html/libxslt-extensions.html: 48ba473ecaca35f0e9d118bfe569a4ce +share/doc/libxslt-1.1.33/html/html/libxslt-extra.html: caf4705080e4ff3f3ade158e71226d47 +share/doc/libxslt-1.1.33/html/html/libxslt-functions.html: bb94525f596eb9c2e1f3920758659832 +share/doc/libxslt-1.1.33/html/html/libxslt-imports.html: fc82892efd0d57468cf0bbae61aeb34f +share/doc/libxslt-1.1.33/html/html/libxslt-keys.html: 595c6d8e3cbd5836d765a714cdaa8662 +share/doc/libxslt-1.1.33/html/html/libxslt-lib.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/libxslt-namespaces.html: f1957f303bf803b546fea20c3210e66c +share/doc/libxslt-1.1.33/html/html/libxslt-numbersInternals.html: 8270d01773d6827cef5eb0e5fbc06cbe +share/doc/libxslt-1.1.33/html/html/libxslt-pattern.html: 68a6e5041985bd90b062f225d3e4a4ea +share/doc/libxslt-1.1.33/html/html/libxslt-preproc.html: 2e5b3d40d10b5d19f8d8981890fa60e6 +share/doc/libxslt-1.1.33/html/html/libxslt-security.html: 0fc54dbb04c31db7273540c6aa15b789 +share/doc/libxslt-1.1.33/html/html/libxslt-templates.html: f795df05f5ada549196b3b0af2b51b6f +share/doc/libxslt-1.1.33/html/html/libxslt-transform.html: 4e6ec4dbc8937a8c616f86691efbbf00 +share/doc/libxslt-1.1.33/html/html/libxslt-variables.html: 35187493583603e51076ec5a24641ef9 +share/doc/libxslt-1.1.33/html/html/libxslt-xslt.html: e94fba7be3d50049b723a80d3b0a1b40 +share/doc/libxslt-1.1.33/html/html/libxslt-xsltInternals.html: cc1b16d88f1793e3a851668a70c9c759 +share/doc/libxslt-1.1.33/html/html/libxslt-xsltexports.html: 21afd523be589d91dac3cdd1692d434c +share/doc/libxslt-1.1.33/html/html/libxslt-xsltlocale.html: 81fdb21658d2250d7d760a3ce7fb7e2f +share/doc/libxslt-1.1.33/html/html/libxslt-xsltutils.html: ac754a1cb0a4674f5f9758c5e5349901 +share/doc/libxslt-1.1.33/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 +share/doc/libxslt-1.1.33/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa +share/doc/libxslt-1.1.33/html/index.html: 05e32435399ac231b17cd820de78ac70 +share/doc/libxslt-1.1.33/html/internals.html: 922c61987ad85ba31859d1fa36ca2fc2 +share/doc/libxslt-1.1.33/html/intro.html: f7674ee30704647018c1cdd5ffa4b56f +share/doc/libxslt-1.1.33/html/news.html: 61820b5fa72adba71e24ff667a33473b +share/doc/libxslt-1.1.33/html/node.gif: e0b48d09fa64e4a64831c42c4f9e6331 +share/doc/libxslt-1.1.33/html/object.gif: 879905dbfdc584f7a8543b7804cc3ff4 +share/doc/libxslt-1.1.33/html/processing.gif: e6924e110962e92a04d6d3f1f1196b31 +share/doc/libxslt-1.1.33/html/python.html: c8c7fafbda61cd06c188c4cceb78184e +share/doc/libxslt-1.1.33/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 +share/doc/libxslt-1.1.33/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f +share/doc/libxslt-1.1.33/html/stylesheet.gif: 15a7ac6844ef2b2a7f601ed6cb6cb277 +share/doc/libxslt-1.1.33/html/templates.gif: e1ac04018d8f602adbd28a72153f9956 +share/doc/libxslt-1.1.33/html/tutorial/libxslt_tutorial.c: 0c3d2acbfb0be23b984c695600170d16 +share/doc/libxslt-1.1.33/html/tutorial/libxslttutorial.html: ee8ec694b4a88c4b6503f5301c998ecd +share/doc/libxslt-1.1.33/html/tutorial/libxslttutorial.xml: 7f3bb19c2dcc54c5f76e953a65dbd339 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.c: 01a91d21b5e9a1e2259752d5325feaf0 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.html: ac0dc678b3ab0da56681555c51e6fa64 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.xml: 0c0faafe5595b19ebe09f6110fe3a7fd +share/doc/libxslt-1.1.33/html/xslt.html: 1374af624caff863c3a74a0638cc864e +share/doc/libxslt-1.1.33/html/xsltproc.html: fa713b8a3fd6b30a19319a821d7bb238 +share/doc/libxslt-1.1.33/html/xsltproc2.html: 52997d42ce172e9b1cace319bb5aaa0b +share/man/man1/xsltproc.1: de3280d3d36348484726358785ec0b16 +share/man/man3/libexslt.3: c7089bab11720e9c9c17962a68c528ff +share/man/man3/libxslt.3: e4962632ed2590adad3621054417bd2a diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt new file mode 100644 index 00000000..16a5f30e --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt @@ -0,0 +1,131 @@ +1563315757 +bin/libexslt-0.dll: 8246da72c1d928df83645852d0aad04d +bin/libxslt-1.dll: 4313a0eef07d9f23605018a709f094ef +bin/xslt-config: 8da5db250243d255558b3e78442b2509 +bin/xsltproc.exe: a71a65dbab3e694b8aea4a6a7f115c29 +conaninfo.txt: ae8f13739b7fa8ffd7f6802c7de8d097 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: 0ecd038f6193e48046754b4c19c5100a +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: 57168ad99e4e28bcfeea713ead5cea37 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.dll.a: 4115a89bfabd8b730ff512618fb73cd9 +lib/libexslt.la: 64bd984341b00db0bef87e5452b8a52c +lib/libxslt.dll.a: 235305b53da66753ff5f80e481084d49 +lib/pkgconfig/libexslt.pc: 96de8f80e8e66cc6fa593aaaae8f0d79 +lib/pkgconfig/libxslt.pc: ca661115f87755258b6c925774d0bc04 +lib/xsltConf.sh: 9fcd150c391ae3fba108aa9ec272601b +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 +share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 +share/doc/libxslt-1.1.33/html/API.html: 99b964a0e24da7db2d479302fbde49ef +share/doc/libxslt-1.1.33/html/APIchunk0.html: 2606a248a6bcc15dc3a0a7b24aa4c986 +share/doc/libxslt-1.1.33/html/APIchunk1.html: b7d490ac26795f95c2bef95c0a594602 +share/doc/libxslt-1.1.33/html/APIchunk10.html: 21469e5e8bddfc34612199bcbe475986 +share/doc/libxslt-1.1.33/html/APIchunk11.html: d885dc364ca2e7f673e70a8e4bebe708 +share/doc/libxslt-1.1.33/html/APIchunk12.html: bf1786a4eec69d7f07b1b343e5896578 +share/doc/libxslt-1.1.33/html/APIchunk13.html: a6260a4828dede37e72fcba0b0896bbc +share/doc/libxslt-1.1.33/html/APIchunk2.html: d23cc069d98f804c94b5f89d689df18d +share/doc/libxslt-1.1.33/html/APIchunk3.html: 726cc909e934c30b155938c7e3054514 +share/doc/libxslt-1.1.33/html/APIchunk4.html: 6ae81594249831b8fb705cf93e2aeb1c +share/doc/libxslt-1.1.33/html/APIchunk5.html: abec4cefc8e617a8a5a09a4eb698f1b2 +share/doc/libxslt-1.1.33/html/APIchunk6.html: fbf021be7dc8290f2e982f142db88c65 +share/doc/libxslt-1.1.33/html/APIchunk7.html: 8a239dc2258366ba021dff7da5bff984 +share/doc/libxslt-1.1.33/html/APIchunk8.html: 477f0b927ea36d2b304b4d9cc50c1d33 +share/doc/libxslt-1.1.33/html/APIchunk9.html: 6a3e5b1297a1ac42a923be4572e910b1 +share/doc/libxslt-1.1.33/html/APIconstructors.html: 024a521581bd48526c32d53ad523ca7d +share/doc/libxslt-1.1.33/html/APIfiles.html: 5d7c6992d4f45cc688140d67c1c36819 +share/doc/libxslt-1.1.33/html/APIfunctions.html: 3507a0636b416c3d0e26d751ffbc89b4 +share/doc/libxslt-1.1.33/html/APIsymbols.html: b4e69e2a3f573e06627682607098e7d5 +share/doc/libxslt-1.1.33/html/EXSLT/APIchunk0.html: be037131987b78b19b9e61ce54877bee +share/doc/libxslt-1.1.33/html/EXSLT/APIconstructors.html: 3da084171718dfe3cfc77c6d4350762f +share/doc/libxslt-1.1.33/html/EXSLT/APIfiles.html: d67a66297a2fd601bc1553874765a315 +share/doc/libxslt-1.1.33/html/EXSLT/APIfunctions.html: 6b0b4b814785deca06fb32b27d1421db +share/doc/libxslt-1.1.33/html/EXSLT/APIsymbols.html: 39928a27a9ada210627deef998899296 +share/doc/libxslt-1.1.33/html/EXSLT/bugs.html: 7e22e19ae460ec6a27849b6bf2870eaf +share/doc/libxslt-1.1.33/html/EXSLT/docs.html: de04679a46246ab14183bfddfb9fe21e +share/doc/libxslt-1.1.33/html/EXSLT/downloads.html: 775d1c9006018e2a6afbd46aabac94cc +share/doc/libxslt-1.1.33/html/EXSLT/exslt.html: 506581c3f25d8dbc5443c8892dfd09fe +share/doc/libxslt-1.1.33/html/EXSLT/help.html: 6a3ae7a677b508299d6843ec2aa06919 +share/doc/libxslt-1.1.33/html/EXSLT/index.html: f10878530c0c370434e38f8669b87fb2 +share/doc/libxslt-1.1.33/html/EXSLT/intro.html: 08c5743544fa11d3e47794d2bddf58c5 +share/doc/libxslt-1.1.33/html/FAQ.html: d50bcf8a29a1593dd5e0a3821071274f +share/doc/libxslt-1.1.33/html/Libxslt-Logo-180x168.gif: e6f8bb7e4a5a426380d387adaedadad9 +share/doc/libxslt-1.1.33/html/Libxslt-Logo-90x34.gif: 6b3ac58ce6c3e622db3dbf83d127f1ac +share/doc/libxslt-1.1.33/html/bugs.html: f724ff1f191cd6d6006ff81f85b84987 +share/doc/libxslt-1.1.33/html/contexts.gif: 8d882ee509aaba54abf791a312fdb617 +share/doc/libxslt-1.1.33/html/contribs.html: c3d4e7a850f0d5e373f857093b092fbc +share/doc/libxslt-1.1.33/html/docbook.html: 776f814590907d566008cb194162da1a +share/doc/libxslt-1.1.33/html/docs.html: 4291a6eb59ef115310843882330d25f1 +share/doc/libxslt-1.1.33/html/downloads.html: a34b24da9c37d11b160a51375b2d8e26 +share/doc/libxslt-1.1.33/html/extensions.html: d9dc8d45c36e77af9b229d9de2fa184c +share/doc/libxslt-1.1.33/html/help.html: ec0ba42602368c606bb282ae37d6e8ff +share/doc/libxslt-1.1.33/html/html/book1.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/home.png: f6192f4292d744423df690e785d60fdf +share/doc/libxslt-1.1.33/html/html/index.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/left.png: f771308152ab24a69682daed70ce136d +share/doc/libxslt-1.1.33/html/html/libxslt-attributes.html: 01e3dad54911c715af8eb4edd03680d7 +share/doc/libxslt-1.1.33/html/html/libxslt-documents.html: 04b4f566bc179282ba31e4086733d392 +share/doc/libxslt-1.1.33/html/html/libxslt-extensions.html: 48ba473ecaca35f0e9d118bfe569a4ce +share/doc/libxslt-1.1.33/html/html/libxslt-extra.html: caf4705080e4ff3f3ade158e71226d47 +share/doc/libxslt-1.1.33/html/html/libxslt-functions.html: bb94525f596eb9c2e1f3920758659832 +share/doc/libxslt-1.1.33/html/html/libxslt-imports.html: fc82892efd0d57468cf0bbae61aeb34f +share/doc/libxslt-1.1.33/html/html/libxslt-keys.html: 595c6d8e3cbd5836d765a714cdaa8662 +share/doc/libxslt-1.1.33/html/html/libxslt-lib.html: 38e702d7abb51be701e9e4a132b7fbf3 +share/doc/libxslt-1.1.33/html/html/libxslt-namespaces.html: f1957f303bf803b546fea20c3210e66c +share/doc/libxslt-1.1.33/html/html/libxslt-numbersInternals.html: 8270d01773d6827cef5eb0e5fbc06cbe +share/doc/libxslt-1.1.33/html/html/libxslt-pattern.html: 68a6e5041985bd90b062f225d3e4a4ea +share/doc/libxslt-1.1.33/html/html/libxslt-preproc.html: 2e5b3d40d10b5d19f8d8981890fa60e6 +share/doc/libxslt-1.1.33/html/html/libxslt-security.html: 0fc54dbb04c31db7273540c6aa15b789 +share/doc/libxslt-1.1.33/html/html/libxslt-templates.html: f795df05f5ada549196b3b0af2b51b6f +share/doc/libxslt-1.1.33/html/html/libxslt-transform.html: 4e6ec4dbc8937a8c616f86691efbbf00 +share/doc/libxslt-1.1.33/html/html/libxslt-variables.html: 35187493583603e51076ec5a24641ef9 +share/doc/libxslt-1.1.33/html/html/libxslt-xslt.html: e94fba7be3d50049b723a80d3b0a1b40 +share/doc/libxslt-1.1.33/html/html/libxslt-xsltInternals.html: cc1b16d88f1793e3a851668a70c9c759 +share/doc/libxslt-1.1.33/html/html/libxslt-xsltexports.html: 21afd523be589d91dac3cdd1692d434c +share/doc/libxslt-1.1.33/html/html/libxslt-xsltlocale.html: 81fdb21658d2250d7d760a3ce7fb7e2f +share/doc/libxslt-1.1.33/html/html/libxslt-xsltutils.html: ac754a1cb0a4674f5f9758c5e5349901 +share/doc/libxslt-1.1.33/html/html/right.png: ebd7e6d206d73850d77d305ab548f957 +share/doc/libxslt-1.1.33/html/html/up.png: 2f07d9272deb4ae870ca6821117877fa +share/doc/libxslt-1.1.33/html/index.html: 05e32435399ac231b17cd820de78ac70 +share/doc/libxslt-1.1.33/html/internals.html: 922c61987ad85ba31859d1fa36ca2fc2 +share/doc/libxslt-1.1.33/html/intro.html: f7674ee30704647018c1cdd5ffa4b56f +share/doc/libxslt-1.1.33/html/news.html: 61820b5fa72adba71e24ff667a33473b +share/doc/libxslt-1.1.33/html/node.gif: e0b48d09fa64e4a64831c42c4f9e6331 +share/doc/libxslt-1.1.33/html/object.gif: 879905dbfdc584f7a8543b7804cc3ff4 +share/doc/libxslt-1.1.33/html/processing.gif: e6924e110962e92a04d6d3f1f1196b31 +share/doc/libxslt-1.1.33/html/python.html: c8c7fafbda61cd06c188c4cceb78184e +share/doc/libxslt-1.1.33/html/redhat.gif: dd0216f442bf6845c103aba1b4bcb869 +share/doc/libxslt-1.1.33/html/smallfootonly.gif: e92b022a99a76d6fceeb35576bb7718f +share/doc/libxslt-1.1.33/html/stylesheet.gif: 15a7ac6844ef2b2a7f601ed6cb6cb277 +share/doc/libxslt-1.1.33/html/templates.gif: e1ac04018d8f602adbd28a72153f9956 +share/doc/libxslt-1.1.33/html/tutorial/libxslt_tutorial.c: 0c3d2acbfb0be23b984c695600170d16 +share/doc/libxslt-1.1.33/html/tutorial/libxslttutorial.html: ee8ec694b4a88c4b6503f5301c998ecd +share/doc/libxslt-1.1.33/html/tutorial/libxslttutorial.xml: 7f3bb19c2dcc54c5f76e953a65dbd339 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.c: 01a91d21b5e9a1e2259752d5325feaf0 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.html: ac0dc678b3ab0da56681555c51e6fa64 +share/doc/libxslt-1.1.33/html/tutorial2/libxslt_pipes.xml: 0c0faafe5595b19ebe09f6110fe3a7fd +share/doc/libxslt-1.1.33/html/xslt.html: 1374af624caff863c3a74a0638cc864e +share/doc/libxslt-1.1.33/html/xsltproc.html: fa713b8a3fd6b30a19319a821d7bb238 +share/doc/libxslt-1.1.33/html/xsltproc2.html: 52997d42ce172e9b1cace319bb5aaa0b +share/man/man1/xsltproc.1: de3280d3d36348484726358785ec0b16 +share/man/man3/libexslt.3: c7089bab11720e9c9c17962a68c528ff +share/man/man3/libxslt.3: e4962632ed2590adad3621054417bd2a diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt new file mode 100644 index 00000000..72fc7217 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt @@ -0,0 +1,39 @@ +1563314699 +bin/libexslt.dll: 2f6c1b0675b471626eb6b059c62dc47d +bin/libxslt.dll: ce6e74e9f547eb8075a38217fce288bc +bin/xsltproc.exe: 6b622ec4f565be591db0a1512e62afd0 +conaninfo.txt: c5e083fe93cb280366b4719ebc623f14 +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 83c28cbab61567177227bc7d65cedc5d +include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 +lib/libexslt.lib: b42f86d1df0d2ea5acdab2358ce0e342 +lib/libexslt_a.lib: ede1e3dd3681e09f5aebb24c1f27f34a +lib/libxslt.lib: e27ebe0519adda4e86bdb7c66084dd5f +lib/libxslt_a.lib: cee614fe2761af1dc0ad4a5ab3da444f +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..6b51b7b6 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,7 @@ +1563296424 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +LICENSE: 1ac8330e79e050867144e174d80880f7 +conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d +export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7 +export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7 +export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt new file mode 100644 index 00000000..45447d86 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt @@ -0,0 +1,9 @@ +1563296480 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb +include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda +include/zlib.h: 0338828e9d00c94645648b1517108324 +lib/libzlib.a: 5dc51a25ecef8f9c97e6b67cec736634 +lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99 +licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e +zlib.pc: 29adeed07108745c3562dc19343f3d99 diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index d7806e94..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,4 +0,0 @@ -1479836260 -CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81 -FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56 -conanfile.py: e8de244463aa84c51238f1fd22a1ae00 \ No newline at end of file diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt deleted file mode 100644 index 88b5c152..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt +++ /dev/null @@ -1,56 +0,0 @@ -1479836298 -FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56 -conaninfo.txt: e2f8774ada0606cca4800e6f6987394e -include/blast.h: fa67f1dd7e681b188546423884fe25ec -include/crc32.h: f28d16b67efecdfafa0d816a7d982124 -include/crypt.h: 6e72c46776f0db175ec8f15144a3c250 -include/deflate.h: 7ceae74a13201f14c91623116af169c3 -include/gzguts.h: b337a2af7b4c7af157b1b2a9dd64c0f8 -include/gzlog.h: 7d497747a90370d3b13320bbf97e65dc -include/infback9.h: 52b1ed99960d3ed7ed60cd20295e64a8 -include/inffast.h: f3669099d3f571dbc0426401ed5f50e3 -include/inffix9.h: 1558f49aeca6376b7aa331add59e0e06 -include/inffixed.h: 7fa3e91804601b6618c915b76a8dc332 -include/inflate.h: 8f1b05cdf36a269882a955071b140162 -include/inflate9.h: 8a4de1bca6c4182d025ea55062d125d9 -include/inftree9.h: be5cf855a19b76feb28468e5b46145b7 -include/inftrees.h: ec87be89b9bcca8ced80a70f857e823b -include/ioapi.h: 7d6c0585719ba47fd356795801befc6d -include/iowin32.h: 818e2950cc00d787eaa9b710007dc53f -include/mztools.h: 7caac7503f8f002d61e0f0e5b7f33bc6 -include/puff.h: 7ecbeeb67e09a843961187673974f86d -include/trees.h: 51fdcb3e2ccf60ca13c06920c89296a3 -include/unzip.h: 11ae6a9d654c95c47da55fe16772a1e5 -include/zconf.h: 371f055f4b9c75a473da59dfb9268f21 -include/zfstream.h: 938f58c179fabf6ff9ffb85395ada81f -include/zip.h: e1495f151b00503a64aae7b375cc3b80 -include/zlib.h: 64d8a5180bd54ff5452886e4cbb21e14 -include/zstream.h: a980b61c1e8be68d5cdb1236ba6b43e7 -include/zutil.h: 04fcfbb961591c9452c4d0fd1525ffdf -lib/C.includecache: 2a275573d6bdd65a8b8ef59f629c18ba -lib/DependInfo.cmake: ae32810aa874699287b057a57bb4ebe3 -lib/adler32.obj: 628307ada6c4f583837f98a86f0cdc7a -lib/build.make: d22b7b24b231da06fed02e9c19860d8c -lib/cmake_clean.cmake: 02e9e0e203fb9e96f49a4136f66ae6d9 -lib/cmake_clean_target.cmake: 0d82d9dfb4e94fa1d2c8201023c801ab -lib/compress.obj: fd3ee3b189db238906e6d8c3bc7f3785 -lib/crc32.obj: 4a4ea589d4cb9c892a9690446bded090 -lib/deflate.obj: 5c08287751273abb2649a39abd33b57c -lib/depend.internal: 9f57661ca5d24b63b07e4b17717dbf31 -lib/depend.make: 3565852809d7357179f74379be7af651 -lib/flags.make: 15b3124297b5ec74b2f7ba7876adca3e -lib/gzclose.obj: fa130c24a884e3db58195315eb2002e9 -lib/gzlib.obj: 100b5cdf0edf3cf759446d8a836a9e63 -lib/gzread.obj: e44720562c175dd122e99a158a87272a -lib/gzwrite.obj: 2943d7662bee2a9367c62d5a5a84e122 -lib/includes_C.rsp: 459fa74070615e1040d5c8dfd9bd5177 -lib/infback.obj: e19339854ee788b1ac54cd97e03fde0b -lib/inffast.obj: 067b8b689801213f6740e05405053a84 -lib/inflate.obj: a429f8ec8a73d923911f50f0153b5e42 -lib/inftrees.obj: 8a7349abf3599a7d2d5b88578fa44ac4 -lib/libzlibstatic.a: 91f1ddd318e256ffb4c526e111ed063f -lib/link.txt: f94b96609f51147e6e09cd3143aaac07 -lib/progress.make: 20799cec453b892ad5a11033508bce80 -lib/trees.obj: a9f9d07743b1742ed4e466469581c54f -lib/uncompr.obj: d46edd5a818878e69c138a5bde688b22 -lib/zutil.obj: d59a363a9262423a29179499e1479c45 \ No newline at end of file diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 deleted file mode 100644 index d33ceea8..00000000 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 new file mode 100644 index 00000000..d33ceea8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 @@ -0,0 +1,17 @@ +. "$PSScriptRoot\..\common\windows\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2017-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 15 ` + -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index a7ced8ae..0c910ea2 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,7 +1,8 @@ [requires] -icu/59.1@vitallium/stable -libxml2/2.9.4@vitallium/stable -libxslt/1.1.29@vitallium/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable [generators] cmake @@ -9,12 +10,20 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True +libjpeg-turbo:shared=False + [imports] -bin, icudt59.dll -> ./bin -bin, icuin59.dll -> ./bin -bin, icuuc59.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 deleted file mode 100644 index 40131a81..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ /dev/null @@ -1,33 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 new file mode 100644 index 00000000..a651bb0c --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -0,0 +1,53 @@ +. "$PSScriptRoot\..\common\windows\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2017-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 15 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2017-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 15 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86 ` + -Arch x86 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "dwarf2" ` + -CompilerThreads "posix" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86_64 ` + -Arch x86_64 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "seh" ` + -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index a7ced8ae..4d9ca4b9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -1,7 +1,8 @@ [requires] -icu/59.1@vitallium/stable -libxml2/2.9.4@vitallium/stable -libxslt/1.1.29@vitallium/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable [generators] cmake @@ -9,12 +10,22 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True +libjpeg-turbo:shared=False + [imports] -bin, icudt59.dll -> ./bin -bin, icuin59.dll -> ./bin -bin, icuuc59.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin +bin, libxml2-2.dll -> ./bin +bin, libxslt-1.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 deleted file mode 100644 index 4aa9658d..00000000 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw53-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion "5.3" ` - -CompilerLibcxx "libstdc++11" diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 new file mode 100644 index 00000000..aa380a09 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86 ` + -Arch x86 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "dwarf2" ` + -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 4a5bc05d..7a5a892a 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -1,8 +1,9 @@ [requires] -icu/57.1@annulen/stable -libxml2/2.9.4@annulen/stable -libxslt/1.1.29@annulen/stable -zlib/1.2.8@annulen/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable +zlib/1.2.11@qtproject/stable [generators] cmake @@ -10,13 +11,22 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True + +libjpeg-turbo:shared=False + zlib:shared=False [imports] -lib, icudt57.dll -> ./bin -lib, icuin57.dll -> ./bin -lib, icuuc57.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2-2.dll -> ./bin bin, libxslt-1.dll -> ./bin -- cgit v1.2.3 From 71e93228623d6e97baa54a292b167b968617387a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 27 Jul 2019 22:30:52 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtqa | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 547f216e..28af6e97 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 547f216efdef3667b0b23ecddce93e5184806800 +Subproject commit 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 diff --git a/qtconnectivity b/qtconnectivity index 9aca6982..96dd4e7f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9aca6982435eb5acb69b95b17f33bc454a94487b +Subproject commit 96dd4e7ff0b10ac79798f1ae63db716bcc199e87 diff --git a/qtdoc b/qtdoc index e784b193..6fbbbfd6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e784b193f8892c169890cc4783cfcc5c61243dda +Subproject commit 6fbbbfd69274507eae820959bd187c7b565e9d4a diff --git a/qtqa b/qtqa index c0bdb898..21586570 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c0bdb8987cec136b22b72da00d044e57cd2fe644 +Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 diff --git a/qtwebengine b/qtwebengine index 1e11cc6c..cc2397ee 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1e11cc6c856b731a7e8d42a433840671c46e97a8 +Subproject commit cc2397eea05eedbbcbf8a592fad13ee51f6db5cf -- cgit v1.2.3 From ac2a57b1c3cbabfbb504659c88042c96d08294c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 28 Jul 2019 22:31:00 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91 Reviewed-by: Qt Submodule Update Bot --- qtremoteobjects | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtremoteobjects b/qtremoteobjects index cbef241d..6ccba37d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cbef241ded4c7255f163af962293c201b27f341f +Subproject commit 6ccba37dedcb37507fd1ab3c72e576c0b005e572 diff --git a/qtwebengine b/qtwebengine index cc2397ee..fa555f40 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cc2397eea05eedbbcbf8a592fad13ee51f6db5cf +Subproject commit fa555f40bca60e82194bef22915bf7c545082c0e -- cgit v1.2.3 From f84c90706da88bbd85778ecc6f2effab08c81286 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 28 Jul 2019 23:30:46 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 0ce3f7d6..e24a4976 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0ce3f7d62b93427ca5d0f4284ba774691cbbd4a7 +Subproject commit e24a4976bebd7ca90deac2b40c08900625773a99 diff --git a/qtdeclarative b/qtdeclarative index d94dd247..0944ff26 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d94dd247ecd6753150dc2a7ef6be4ccb482e9423 +Subproject commit 0944ff26223bd2c809025c9f42bc9935213f0d43 diff --git a/qtdoc b/qtdoc index 2eb2e153..4ef5512d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2eb2e153f0f7b9c3112c269f87c0faf37df97edb +Subproject commit 4ef5512d625f2ee5198f08645482bd42d90e47f2 diff --git a/qtqa b/qtqa index c0bdb898..21586570 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c0bdb8987cec136b22b72da00d044e57cd2fe644 +Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 -- cgit v1.2.3 From abfbc0668c4af506cc306ece9d087dfbaacb01b1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 Jul 2019 10:22:07 +0200 Subject: Disable tests for MSVC2015/Win32/64bit Frequent crashes of tst_QDir have been again observed recently in the dev branch with MSVC2015. It should be sufficient to test MSVC2017; MSVC2015 should only be compile-tested. Task-number: QTBUG-58654 Change-Id: I0eb5a1294432a24548468c993418bc18671547bb Reviewed-by: Simon Hausmann Reviewed-by: Dimitrios Apostolou Reviewed-by: Edward Welbourne --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 6152eab0..332c7d3c 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,9 +1,9 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 MSVC2015 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -- cgit v1.2.3 From ddbebe9daca6358e00ea61445c4fd90ae5f6b67a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Jul 2019 10:59:20 +0200 Subject: Stop building debug-and-release packages for MinGW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The requirement to separate debug and release DLLs on Windows stems from the Visual Studio C run-time library appearing in two different variants (debug and release) and not mixing well. It's possible to perform builds without optimzations and with debug symbols while linking against the release version of the C run-time, but at the same time the debug version of the run-time brings other developer visible advantages. MinGW on the other hand does not have this distinction, does not ship with separate DLLS and does also not require the VS C runtime library. Therefore we do not need this separation for MinGW, which means that our packages can be reduced in size and application developers wishing to debug their applications do not have to use debug builds of the Qt libraries or run into Qt internal debug code. This change is in preparation for turning off debug-and-release in qtbase. Since coin overrides the Qt defaults, this change needs to be applied first. Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35 Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- coin/platform_configs/qt3d-runtime.txt | 4 ++-- coin/platform_configs/qt5.txt | 4 ++-- coin/platform_configs/qtwebkit.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 80319e1b..7fe6794b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -2,8 +2,8 @@ Template Target OS Target arch Compiler Target C --------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 80319e1b..7fe6794b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,8 +2,8 @@ Template Target OS Target arch Compiler Target C --------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 9e1c893f..ed004999 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -release -opengl dynamic -- cgit v1.2.3 From a268fb46895f694a58da2389fd47ca393a68deef Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 29 Jul 2019 14:26:43 +0200 Subject: Adjust submodule branches Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6addc7..1aa79a80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.13 + branch = 5.13.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.13 + branch = 5.13.1 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.13 + branch = 5.13.1 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.13 + branch = 5.13.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.13 + branch = 5.13.1 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,86 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.13 + branch = 5.13.1 status = preview -- cgit v1.2.3 From 0b2f4d57e47eae6ca296d4a9c132f9ebdd6423f4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 8 Jul 2019 17:48:52 +0200 Subject: Update qt5 wip/qt6 qtbase pointing to dev branch, and other repos pointing to wip/qt6. qtwebengine and qtwebview are not built at the moment. The build of the mentioned repos will be restored after bumping qtbase version to 6.0.0, and after the subsequent qt/qt5 wip/qt6 integration is merged. Change-Id: I9b6b8136b2f58b181ae2d2dadb8a96b9c1103225 Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3c46af7..88c9d120 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,7 +230,7 @@ path = qtwebview url = ../qtwebview.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats diff --git a/qt3d b/qt3d index b0db56de..58db7d01 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0db56ded0f38e9f59f379c6ff80b668ed49c743 +Subproject commit 58db7d01e0d424fdf46baa70e2e41b8009429c78 diff --git a/qtactiveqt b/qtactiveqt index 2d740d31..be1aab20 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2d740d313342a014169d5f317da53e499ff4432e +Subproject commit be1aab204340c1af23df1c393970f5d245ec0a33 diff --git a/qtandroidextras b/qtandroidextras index ecdf7177..d5709763 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ecdf7177b90c8c5de060da076b12e4869e57b4d5 +Subproject commit d5709763486bab11b545000df90b2b79fa5acdd9 diff --git a/qtcharts b/qtcharts index 9e28f427..a3259145 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9e28f427009ee3cd25b4d1a8cd446049d51152a4 +Subproject commit a325914557d7a56d0ce3ad789a703fdb1c96d597 diff --git a/qtconnectivity b/qtconnectivity index 16e37407..00cc61aa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16e37407cd6ad369d5250de1b9dac83083a45200 +Subproject commit 00cc61aa4e9d624dc4894afe819f7413a9204a68 diff --git a/qtdatavis3d b/qtdatavis3d index 21583347..7d898954 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 215833472171b17db506d49646c639b4fff926ab +Subproject commit 7d898954aa9e3c75d44abae81dff563a8b4b003d diff --git a/qtdeclarative b/qtdeclarative index 0f2178a7..ad4960b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0f2178a7e3cba4992f8b6e32927534daa5c6ee7e +Subproject commit ad4960b40461c8b83599fe71540086182adecb10 diff --git a/qtdoc b/qtdoc index 9debad60..4813f219 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9debad60b88ffb51f50d111f9b4f871f5418622b +Subproject commit 4813f21919eb8b240f4b8c704b9298ac5e1d0731 diff --git a/qtgamepad b/qtgamepad index 337abe99..c6caf0b0 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 337abe99492d7d6d5229b615fa1559fc2f4ee6eb +Subproject commit c6caf0b09b934c03a11c1b97df8e453875332f7b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fe2eefc0..042890a0 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fe2eefc036f3f42457e7f2e012f21fdec84550eb +Subproject commit 042890a01c19595a91268c536b81a94134b91807 diff --git a/qtlocation b/qtlocation index a0cc254c..0a8f8f40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 +Subproject commit 0a8f8f40c2fdfccc4bd1bf3c7411085ed634700e diff --git a/qtlottie b/qtlottie index 254ea99a..afb6ddb7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 254ea99abd181abe5468b7cc5ece0e2ae51da185 +Subproject commit afb6ddb79c573c205ecffeccf9000132f566700f diff --git a/qtmacextras b/qtmacextras index ca1414e6..850602bb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ca1414e6b7ce219efa86e965a5c031b79e7a604e +Subproject commit 850602bb38337060ed31c1a8bbcff6eb195ffcc0 diff --git a/qtmultimedia b/qtmultimedia index f0f354f2..e99a2e17 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f0f354f2a1eec54733c871bf735f67e0c4ea945c +Subproject commit e99a2e1701179d0d28ef1d1eac696d480894f4bb diff --git a/qtpurchasing b/qtpurchasing index 91fc2ee3..0b3d10cd 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 91fc2ee34cfd674d134e88dc7f3c54453ec685e7 +Subproject commit 0b3d10cd5070a54dd71fbd067dcf6691c66c228a diff --git a/qtquickcontrols b/qtquickcontrols index 81c5d9cd..1987f308 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd +Subproject commit 1987f30831954ce05b6d7908b4866999b2d9b183 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9cd1ee92..108ba349 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9cd1ee923eea11d084d41158458bbb73a906c75c +Subproject commit 108ba34909a12d5d2d02a8a9cb738aaf65ac8868 diff --git a/qtquicktimeline b/qtquicktimeline index 6e6d4927..c9e240bc 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f +Subproject commit c9e240bc24e276bbe79c0cf0c7ee8ea3aab59625 diff --git a/qtremoteobjects b/qtremoteobjects index 25d9b378..8e79ec32 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 25d9b378a42daa723dd79191f0f2cfd03285651a +Subproject commit 8e79ec32f81aa65ac9ce1ad42ad1ee5452d42341 diff --git a/qtscript b/qtscript index 583dcc6d..5c7733d5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 +Subproject commit 5c7733d5c5564a64468c5fdd5e8bd29cc131784c diff --git a/qtscxml b/qtscxml index 01bc8df0..38f88ebf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01bc8df0760e14449ca7d5b6c187bf9870efbd3d +Subproject commit 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a447 diff --git a/qtsensors b/qtsensors index 6a8e8a64..a436a733 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6a8e8a64d3473c5ff890c022b738862a704516dc +Subproject commit a436a733c3a07adb61f1ed9e2793fc47453ad2bb diff --git a/qtserialbus b/qtserialbus index f12d420e..9df66161 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f12d420e8492b85e8aa2a7982e81a88cb1098d6c +Subproject commit 9df66161c57e7bee405fff37dfa034f77c254855 diff --git a/qtserialport b/qtserialport index 450156f3..126809f1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 450156f37356f67f217de760a5df3149684dd99f +Subproject commit 126809f150f03ab07b94bb508c89cea25440ac41 diff --git a/qtspeech b/qtspeech index 5cf744a0..b80e22cd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5cf744a096bb079bd33e417e9fb62a6d6726a3a3 +Subproject commit b80e22cd1e79a3a09e69261bcb38497bfe9634f7 diff --git a/qttools b/qttools index f7a50cab..6b2f32f3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 +Subproject commit 6b2f32f3dc9de965801927a4bc5d970028a318a6 diff --git a/qttranslations b/qttranslations index 66952c79..e94d85e9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 66952c79bc648e1074936dddb7fa2cffc17b1777 +Subproject commit e94d85e931ee3704192aa4d42c2bc44f0df47b8e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe52858d..fac2615b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe52858df5c641eb9fb0df02e33d5b328d6b00e7 +Subproject commit fac2615b2775e09a36901575898e0628606d2d06 diff --git a/qtwayland b/qtwayland index 28572232..671f73bb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2857223212ef56810b61ea97fb977573700ab1e0 +Subproject commit 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62e diff --git a/qtwebchannel b/qtwebchannel index 6031bd7b..43ef51f0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6031bd7bfdf97c492f9f11b4bd0a5375613b55de +Subproject commit 43ef51f08bdbd92c8e863fca3b3b8d8955603764 diff --git a/qtwebengine b/qtwebengine index 0c2beb49..83fa1d5f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 +Subproject commit 83fa1d5f9b890ba251f7dc8f82acd950e9527343 diff --git a/qtwebglplugin b/qtwebglplugin index 2f419ac8..384f5518 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3 +Subproject commit 384f551844ddb9ea0042a0894a9dad7a90dd9935 diff --git a/qtwebsockets b/qtwebsockets index 2e54dbe8..a5b0495a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 +Subproject commit a5b0495ac273bcc841298b52dae3ca9bb608edf7 diff --git a/qtwebview b/qtwebview index fac66332..a4a49a9a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fac66332c76e2fc9c29aa2508a41cd9392825d25 +Subproject commit a4a49a9a8784f019358faf9bc76cd716b76609db diff --git a/qtwinextras b/qtwinextras index 878d6226..88277780 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 878d6226f2472b3dff192207aa0c2a03eb4d3465 +Subproject commit 882777808d729ff1cdc129d555a739b065eedbae diff --git a/qtx11extras b/qtx11extras index 821e5be0..0399b825 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea +Subproject commit 0399b825a1ff7470ed6fd272de8ba74e2be971c3 diff --git a/qtxmlpatterns b/qtxmlpatterns index e5582749..ee64d3cb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e5582749e285ff22b634b1e7d0a37f076b2a7be3 +Subproject commit ee64d3cb160347fe19a86b47f3b26b78b20502bf -- cgit v1.2.3 From e6823acbc7b4690f6adcc9fd1cd5c0a2b37564e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Jul 2019 22:31:10 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 28af6e97..3e746341 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 +Subproject commit 3e7463411e549100eee7abe2a8fae16fd965f8f6 diff --git a/qtqa b/qtqa index 21586570..cacf0675 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 +Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 diff --git a/qtwebengine b/qtwebengine index fa555f40..edbe8a4b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fa555f40bca60e82194bef22915bf7c545082c0e +Subproject commit edbe8a4b07d31807e3c298e3bd018353ed77a107 -- cgit v1.2.3 From 38e416be664dc216b332e6b4ff8d38905dfdc1e9 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 16 Apr 2019 10:16:41 +0300 Subject: Add webAssembly build for windows and macos Provision emsdk and its dependecies to windows and macos. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-with: Juha Karjalainen Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011 Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt5.txt | 2 + coin/provisioning/common/linux/emsdk.sh | 81 -------------- coin/provisioning/common/unix/emsdk.sh | 97 +++++++++++++++++ coin/provisioning/common/windows/emsdk.ps1 | 121 +++++++++++++++++++++ coin/provisioning/common/windows/msys.ps1 | 2 +- .../qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh | 4 +- .../qtci-macos-10.13-x86_64/36-emsdk.sh | 6 + .../qtci-windows-10-x86_64/80-emsdk.ps1 | 2 + 8 files changed, 231 insertions(+), 84 deletions(-) delete mode 100755 coin/provisioning/common/linux/emsdk.sh create mode 100755 coin/provisioning/common/unix/emsdk.sh create mode 100755 coin/provisioning/common/windows/emsdk.ps1 create mode 100644 coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh create mode 100755 coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index dfa6a2e3..0a216167 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -22,3 +22,5 @@ qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-x86-64-qcc qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-aarch64le-qcc qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-x86-64-qcc +qtci-windows-10-x86_64-14 WebAssembly Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten +qtci-macos-10.13-x86_64-2 WebAssembly Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh deleted file mode 100755 index 7ccfe0a5..00000000 --- a/coin/provisioning/common/linux/emsdk.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash -############################################################################# -## -## 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$ -## -############################################################################# - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" - -version="1.38.27" -version_node="8.9.1" -urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" -urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" -urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz" -urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" -urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" -urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" -sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" -sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" -targetFolder="/opt/emsdk" -sudo mkdir "$targetFolder" - -InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" - -sudo chmod -R a+rwx "$targetFolder" - -echo "Writing $targetFolder/.emscripten" -cat <"$targetFolder/.emscripten" -LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/' -EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer' -BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen' -NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node' -EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' -SPIDERMONKEY_ENGINE = '' -V8_ENGINE = '' -TEMP_DIR = '/tmp' -COMPILER_ENGINE = NODE_JS -JS_ENGINES = [NODE_JS] -EOM - -SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" -SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" -SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" - -echo "Emsdk = $version" >> ~/versions.txt -echo "Emsdk node = $version_node" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh new file mode 100755 index 00000000..17af067c --- /dev/null +++ b/coin/provisioning/common/unix/emsdk.sh @@ -0,0 +1,97 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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$ +## +############################################################################# + +# shellcheck source=./InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +version="1.38.27" +version_node="8.9.1" +urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages" +urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk" +targetFolder="/opt/emsdk" + +urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz" +urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" + +if uname -a |grep -q Darwin; then + urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz" + urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz" + urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz" + urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz" + sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa" + sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7" + node_js="$targetFolder/node-v$version_node-darwin-x64/bin" +else + urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz" + urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" + urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz" + urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz" + sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" + sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" + node_js="$targetFolder/node-v$version_node-linux-x64/bin" +fi + +sudo mkdir "$targetFolder" + +InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" + +sudo chmod -R a+rwx "$targetFolder" + +echo "Writing $targetFolder/.emscripten" +cat <"$targetFolder/.emscripten" +LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/' +EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer' +BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen' +NODE_JS='$node_js/node' +EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' +SPIDERMONKEY_ENGINE = '' +V8_ENGINE = '' +TEMP_DIR = '/tmp' +COMPILER_ENGINE = NODE_JS +JS_ENGINES = [NODE_JS] +EOM + +SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version:\$PATH\"" +SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" +SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt +echo "Emsdk node = $version_node" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 new file mode 100755 index 00000000..2ce2754f --- /dev/null +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -0,0 +1,121 @@ +############################################################################ +## +## 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 will install emscripten needed by WebAssembly + +$version = "1.38.27" +$versionNode = "8.9.1" +$versionWinPython = "2.7.13" +$versionJre = "8_update_152" + +$urlOfficialMozilla = "https://s3.amazonaws.com/mozilla-games/emscripten/packages" +$urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk" + +$urlOfficialEmscriptenLlvm = "$urlOfficialMozilla/llvm/tag/win_64bit/emscripten-llvm-e$version.zip" +$urlCacheEmscriptenLlvm = "$urlCache/windows/emscripten-llvm-e$version.zip" +$sha1EmscriptenLlvm = "1cd950feec50f1f3265f04ab01fb270250eb4232" + +$urlOfficialNode = "$urlOfficialMozilla/node-v$versionNode-win-x64.zip" +$urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip" +$sha1Node = "249c840f7b953e4cb7ac9db89aa92a98daa1dc63" + +$urlOfficialWinPython = "$urlOfficialMozilla/WinPython-64bit-$versionWinPython.1Zero.zip" +$urlCacheWinPython = "$urlCache/windows/WinPython-64bit-$versionWinPython.1Zero.zip" +$sha1WinPython = "7e5a021878e0165ba0603e995b013e244d6e10cb" + +$urlOfficialProtableJre = "$urlOfficialMozilla/portable_jre_${versionJre}_64bit.zip" +$urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip" +$sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2" + +$urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip" +$urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip" +$sha1Emscripten = "22d78a0af48b50271ab183fd3d8ea2f9ba311ee7" + +$installLocationEmsdk = "C:\\Utils\\emsdk" +$temp = "C:\Windows\Temp" + +function Install { + + Param ( + [string] $urlOfficial = $(BadParam("Official url path")), + [string] $urlCache = $(BadParam("Cached url path")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $location = $(BadParam("Download location")), + [string] $installLocation = $(BadParam("Install location")) + ) + + Download $urlOfficial $urlCache $location + Verify-Checksum $location $sha1 + Extract-7Zip $location $installLocation + +} + +New-Item -ItemType directory -Force -Path "$installLocationEmsdk" + +Install $urlOfficialEmscriptenLlvm $urlCacheEmscriptenLlvm $sha1EmscriptenLlvm "$temp\emscripten-llvm-e$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" +Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk" +Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\WinPython-64bit-$versionWinPython.1Zero.zip" "$installLocationEmsdk" +Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk" +Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk" + +cd $installLocationEmsdk +"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version'" | Out-File '.emscripten' -Encoding ASCII +"EMSCRIPTEN_NATIVE_OPTIMIZER='$installLocationEmsdk\\emscripten-llvm-e$version\\optimizer'" | Out-File '.emscripten' -Append -Encoding ASCII +"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\binaryen'" | Out-File '.emscripten' -Append -Encoding ASCII +"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node'" | Out-File '.emscripten' -Append -Encoding ASCII +"EMSCRIPTEN_ROOT='$installLocationEmsdk\emscripten-$version'" | Out-File '.emscripten' -Append -Encoding ASCII +"SPIDERMONKEY_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII +"V8_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII +"TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII +"COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII +"JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII + +Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk" +Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten" +Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version" +Set-EnvironmentVariable "EMSCRIPTEN_NATIVE_OPTIMIZER" "$installLocationEmsdk\emscripten-llvm-e$version\optimizer.exe" +Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\binaryen" +Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe" +Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64\python.exe" +Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64" +Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version" +Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-$version" +Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-$version;$installLocationEmsdk;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version;$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64;$installLocationEmsdk\java64\bin" + +Write-Output "emsdk = $version" >> ~/versions.txt +Write-Output "emsdk llvm = $version" >> ~/versions.txt +Write-Output "emsdk NodeJs = $versionNode" >> ~/versions.txt +Write-Output "emsdk WinPython 64bit = $versionWinPython" >> ~/versions.txt +Write-Output "emsdk portable jre = $versionJre" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/msys.ps1 b/coin/provisioning/common/windows/msys.ps1 index df67cc20..f004bb49 100644 --- a/coin/provisioning/common/windows/msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -12,5 +12,5 @@ $destination = "C:\msys" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\ - +Set-EnvironmentVariable "MSYS_PATH" "$destination\\1.0\\bin" Write-Output "Msys = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh index 09a76778..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/emsdk.sh -source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh new file mode 100644 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 new file mode 100755 index 00000000..b72470a2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\emsdk.ps1" + -- cgit v1.2.3 From 488415a9c5528f770789bed7d06a50acbbe38a8d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 31 Jul 2019 10:12:48 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I2927de7c1c756d0c2645308e8cdfecce01533bc0 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 +- qtlottie | 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 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 4c03c1f6..d2c52680 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4c03c1f640b6e8877990e587d46696e0fe19e312 +Subproject commit d2c52680884095238ec3859fabaad03157af3985 diff --git a/qtactiveqt b/qtactiveqt index 8d191720..89e2d977 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8d1917209a04286b2befbaff7d8e0ed5256fb232 +Subproject commit 89e2d977323e874b4074aa1b969a4be5141184b8 diff --git a/qtandroidextras b/qtandroidextras index fb0dc08c..503ba3db 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit fb0dc08c88a8a1e0bae6ab5d61af9a97e63b614b +Subproject commit 503ba3db8749b49ed2e4705fd353c897dae390a5 diff --git a/qtbase b/qtbase index f7090544..76be8193 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f70905448f612f52d4c3034faee61fc103b9eb7c +Subproject commit 76be819345228d589cbc4f5129617151ea604750 diff --git a/qtcharts b/qtcharts index 248fff48..9a052d7a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 248fff483ae1597c62a93edf91841b84b363739b +Subproject commit 9a052d7a7e56d312fa52eaef7ff7844ec7019783 diff --git a/qtconnectivity b/qtconnectivity index 183327bc..f2f9da65 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 183327bc16b97276b39479e4257b112037175930 +Subproject commit f2f9da656fd77330cce44dfe0721b3f68f1d809d diff --git a/qtdatavis3d b/qtdatavis3d index 0aec1b99..422856bb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 0aec1b991987f8e990ffe2d110dda5a48bdfbb12 +Subproject commit 422856bb470e1380309c66a8ba4b40e06d1df830 diff --git a/qtdeclarative b/qtdeclarative index 1f01b44d..42872e72 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1f01b44d20471a7f4a5029a4c0049e8296749fef +Subproject commit 42872e720b2d25501587b0ed95f183d2dd9c8441 diff --git a/qtdoc b/qtdoc index 7d4f6e7b..8d0bd28f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7d4f6e7be37a0c81ebb0f2eaa896067a88ab2cb3 +Subproject commit 8d0bd28f8134c479c78972ad9d1448a575c5ef72 diff --git a/qtgamepad b/qtgamepad index 45ebe8e2..ea0457b8 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 45ebe8e27fb5ad90db0125f4e22cbd222f466082 +Subproject commit ea0457b8058191b4bb22477c7b51975a70af0b0e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7f05d1dd..c76eb211 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7f05d1dd2f89c50d4963308838d092a609eb9899 +Subproject commit c76eb211ff12fc3a1588c3092dd76a41eb5551c7 diff --git a/qtimageformats b/qtimageformats index 633f77e8..e7940d95 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 633f77e8e980996b095102ed462ffd228291b7fe +Subproject commit e7940d951e211837ed45b759fb97282e8d65e4c5 diff --git a/qtlocation b/qtlocation index a0cc254c..f8694e1f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 +Subproject commit f8694e1f3430b7851fc90e26c6d778a86219379a diff --git a/qtlottie b/qtlottie index 254ea99a..03b666a9 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 254ea99abd181abe5468b7cc5ece0e2ae51da185 +Subproject commit 03b666a967fb7501248e9f40a5b187ec3a16c453 diff --git a/qtmacextras b/qtmacextras index df70f175..af348830 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit df70f175cc1885f9706bb41252678bea672d1b6c +Subproject commit af348830a3ae6852a4e7ff612c045e11c094ef5f diff --git a/qtmultimedia b/qtmultimedia index 421fa617..43555769 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 421fa617369646eb99750c52a3b38fc3b3015ec6 +Subproject commit 435557691c3c28e9c63aa4bb5f4b9ec8fe3f8923 diff --git a/qtnetworkauth b/qtnetworkauth index e4a3b0c4..272ea7f5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e4a3b0c4558b37d82f9292e12325089330dee5cd +Subproject commit 272ea7f508d8ee30311c08c07c6e0501f17338c2 diff --git a/qtpurchasing b/qtpurchasing index cc046e7a..f58adac0 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit cc046e7ac58e979f2d0a4f858d71bc90f06783aa +Subproject commit f58adac04ad8e36a840a66d14e02e5993b8099e7 diff --git a/qtqa b/qtqa index e9b796db..cacf0675 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 +Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 diff --git a/qtquickcontrols b/qtquickcontrols index 81c5d9cd..b74071e6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd +Subproject commit b74071e607e824d3adbe6bfbe0c9a720f91f3662 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b784d232..2ee78aaf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 +Subproject commit 2ee78aafc81cd35073e9d90c9186e81676dea2ac diff --git a/qtremoteobjects b/qtremoteobjects index c9243cb8..35516bfe 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c9243cb82e991b4f97872282b91b64b512101738 +Subproject commit 35516bfec49c5da9b0e6bcd0731bb5d5b7983944 diff --git a/qtrepotools b/qtrepotools index 61191bf3..da0a7744 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf +Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca diff --git a/qtscript b/qtscript index 3880777f..40b5d325 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3880777ff260a660434d36d6f63da6fd1c25d79d +Subproject commit 40b5d325b6105d4e520c76a079f530168b58efec diff --git a/qtscxml b/qtscxml index b63320b5..279d63c4 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b63320b5eb7296699b3ff77bf4befe73e908e04e +Subproject commit 279d63c4f6632237e6a0d9c4be91b466876c260a diff --git a/qtsensors b/qtsensors index a28678b8..4dfa9553 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a28678b83ac3a5a7530026027e2c16a23379168a +Subproject commit 4dfa95538ff15f59880c93675676ce609b365d89 diff --git a/qtserialbus b/qtserialbus index 533027e8..b8dbe552 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 533027e8bbc17bf39f74ef99edeb395c25d80ab4 +Subproject commit b8dbe5524bd15ea0acc03dc5c5c4bf9f0d912f42 diff --git a/qtserialport b/qtserialport index a0faf986..ad262832 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a0faf986fccdce1d36f3308dc520cdac001f5264 +Subproject commit ad2628329e1685dbccd0ac3c5011336cd2c4f786 diff --git a/qtspeech b/qtspeech index 8374f355..c1860e04 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8374f355a1d8c488e117da1e7fefbf1e2ac28ca0 +Subproject commit c1860e04dfcf9eddcf14cbc4e44f441ad75ffc83 diff --git a/qtsvg b/qtsvg index a6de6b29..b80a1676 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a6de6b295ad99cf1830a91c9f87a359bc84658a8 +Subproject commit b80a1676c9f5cc0b428f15ac09f6648a80aacb26 diff --git a/qttools b/qttools index f7a50cab..61c0d801 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 +Subproject commit 61c0d8017044263dde21f1db57383f6d19f9eb03 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0ed673e3..68375389 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0ed673e31e292d79d1afb5d3c7e168638e654e60 +Subproject commit 68375389bf09427103ab3ff2b7fb1517e9b55615 diff --git a/qtwayland b/qtwayland index 9822df54..ae43ed46 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9822df545cf1aaad684cb6179b214952a4027b71 +Subproject commit ae43ed466e62cc198b7ab85c7f40faaada39c968 diff --git a/qtwebchannel b/qtwebchannel index 25fb211a..29496e3f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 25fb211a32890a1bdd2b28b9727f6806a88d221c +Subproject commit 29496e3f08e20398e253e6d32bb95879a1a68978 diff --git a/qtwebengine b/qtwebengine index 9680828a..33a2c9ae 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9680828ac40d6e10eac02f4981f3668669409acf +Subproject commit 33a2c9aed3ee621c91853570087b500c830792e0 diff --git a/qtwebglplugin b/qtwebglplugin index e80c1bf2..e51341cf 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e80c1bf24039ff36ff874f313be53ac2a70029de +Subproject commit e51341cf20447c42a62281e633513837058f62e5 diff --git a/qtwebsockets b/qtwebsockets index bfe9885c..e108b1f0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bfe9885c1974e9962ca3b0b88030d08a03dfa05c +Subproject commit e108b1f06d18003d7a758b07bc3bea9922b2e116 diff --git a/qtwebview b/qtwebview index 2a88e886..fb2a2003 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2a88e88608eee393e23884c01aaa4ee3082a0ca3 +Subproject commit fb2a2003fbb41ac91b319afb56f290b415befb64 diff --git a/qtwinextras b/qtwinextras index 3386ffc9..ee2d2f7a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3386ffc9bd99d31c9012693e37aa3ce952074773 +Subproject commit ee2d2f7a93c5b0866e91293d6233ae2703281ca6 diff --git a/qtx11extras b/qtx11extras index da824904..15ffa33a 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit da8249048d509e7fa6cf21d33dd96fa29aed2a70 +Subproject commit 15ffa33a162325d2d16437a057e79cd3b0e3d61c diff --git a/qtxmlpatterns b/qtxmlpatterns index d32c85ca..9da08816 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit d32c85cafa29001ada3f7515a9b8f2d76164193a +Subproject commit 9da08816e1072fc1391377a38d6afd9e73d756e0 -- cgit v1.2.3 From d3fbd2ed1adce02f8648aed6b3bbdad4bfa474a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 31 Jul 2019 23:30:57 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index e24a4976..3d7bd7ad 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e24a4976bebd7ca90deac2b40c08900625773a99 +Subproject commit 3d7bd7ad19254bb1c4794349e71501e58c91891e diff --git a/qtdeclarative b/qtdeclarative index 0944ff26..dfc6dc1d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0944ff26223bd2c809025c9f42bc9935213f0d43 +Subproject commit dfc6dc1d94a729f701172861a196b4b34bcd7518 diff --git a/qtdoc b/qtdoc index 4ef5512d..8c6b3135 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4ef5512d625f2ee5198f08645482bd42d90e47f2 +Subproject commit 8c6b31353174e5f95cbc43c0ab51c8b0085b2663 diff --git a/qtimageformats b/qtimageformats index d4861c2a..9100cc7a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d4861c2a836f323e1c4694bf7830e69ef845b8ce +Subproject commit 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e diff --git a/qtqa b/qtqa index 21586570..cacf0675 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 +Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 diff --git a/qttools b/qttools index a9790627..a690022b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a9790627873d17f91f29c9bd8be0fb609ec29f03 +Subproject commit a690022b7e56b2e36a95ef22b854af4c82c5fdc8 -- cgit v1.2.3 From 72f1742097aa147ffd86ce251b3e50627961cde8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 31 Jul 2019 22:31:08 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 7e60b6d5..64e10caa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 +Subproject commit 64e10caaa1c261167fd98f91ce87cbefd11782ca diff --git a/qtbase b/qtbase index 3e746341..4d727108 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e7463411e549100eee7abe2a8fae16fd965f8f6 +Subproject commit 4d7271087e84096abd75fa806bea234daee0cd94 diff --git a/qtcharts b/qtcharts index aa765c1b..a9c48f8e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit aa765c1b7802746e6a97043b62a142eb2d2137af +Subproject commit a9c48f8ea7fd8634263124a742e23bc992fd855e diff --git a/qtdoc b/qtdoc index 6fbbbfd6..d6a01d04 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6fbbbfd69274507eae820959bd187c7b565e9d4a +Subproject commit d6a01d04f77f15e2847875b37412eb2814d723f9 diff --git a/qtquickcontrols b/qtquickcontrols index 845cd17a..b1f360c0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 845cd17a498d6008992b04ec4ca1984e6e73de3c +Subproject commit b1f360c0b0f42b4536cb0bcecd06e76052ec77ef diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 200b4751..7c2ec7dc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 200b47519ffc61ebd06cda9a4c452d7b15e37d33 +Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 diff --git a/qttools b/qttools index 6d19911c..b05d6b04 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6d19911c0db508a1c0079890a0adc8f6ab87bcf7 +Subproject commit b05d6b04e0527953983cc0451015efa27fa58580 diff --git a/qtwebengine b/qtwebengine index edbe8a4b..50dc091b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit edbe8a4b07d31807e3c298e3bd018353ed77a107 +Subproject commit 50dc091b5ddca2fb1c80e398d2ab360a5ec5e767 -- cgit v1.2.3 From 30b0d05343fcc8a0edec379cdc550f9e744cd58f Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 1 Aug 2019 12:24:57 +0300 Subject: Remove 'Packaging' feature from WinRT_10 x86 We don't deliver binaries for that target anymore -> do not export that either Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014 Reviewed-by: Antti Kokko --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6de43501..ce4394fb 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -22,7 +22,7 @@ Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' - Features: ['Packaging', 'DisableTests'] + Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - Template: 'qtci-windows-10-x86_64-10' -- cgit v1.2.3 From b521ad483c68a38361504469f133376ce7f45005 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 31 Jul 2019 14:25:58 +0300 Subject: Update platform_configs for QtWebKit * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0 Reviewed-by: Liang Qi Reviewed-by: Simon Hausmann --- coin/platform_configs/qtwebkit.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 01378ddc..49426405 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,11 +1,5 @@ -- - Template: 'qtci-windows-10-x86_64-10' - Target arch: 'x86' - Compiler: 'MSVC2017' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic' - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' -- cgit v1.2.3 From 125c5e6528abee7796f6e5b68526bc050bd9250e Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 1 Aug 2019 13:42:52 +0300 Subject: Provisioning: update conan_manifests for libxslt packages Package recipe was improved, as a result packages were rebuilt and checksums need update. Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7 Reviewed-by: Simon Hausmann --- .../1.1.33/qtproject/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 16 +++++++--------- .../conanmanifest.txt | 16 +++++++--------- .../conanmanifest.txt | 12 +++++------- .../conanmanifest.txt | 14 +++++++------- .../conanmanifest.txt | 14 +++++++------- .../conanmanifest.txt | 12 +++++------- 7 files changed, 40 insertions(+), 48 deletions(-) diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt index fca5f192..f01b0b20 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/export/conanmanifest.txt @@ -1,3 +1,3 @@ -1563314340 +1564572636 LICENSE.md: 5aa9930034582b90e2008d2c609d1317 -conanfile.py: 85aee547c18dc9922ef9b56faf3e7a07 +conanfile.py: cd5a1ced5c2ea7eebac675979e021936 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt index 33da41c9..9bf86a8e 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt @@ -1,8 +1,8 @@ -1563314516 -bin/libexslt.dll: 1027ae276703fdb975b78af97f50a3fd -bin/libxslt.dll: 5fbe99fe4c940217a9a18593b3580701 -bin/xsltproc.exe: 7b2a42162459c1b506d563c6fb449afd -conaninfo.txt: 131c2efa982318cd7b48007ceedd90c2 +1564656371 +bin/libexslt.dll: 89db784739897fce0f3eb2d1e9eb999e +bin/libxslt.dll: 540a0335b4abe7684a79df6f1e3af541 +bin/xsltproc.exe: 35f757a2ae4c7ec075ea77726ceaf9e8 +conaninfo.txt: e7802d9fecb7b400478ba69c2bf3b6fb include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -32,8 +32,6 @@ include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -lib/libexslt.lib: 2de6293c1989c7ff270db23f2a51027f -lib/libexslt_a.lib: c5887a724f9ca61adfcff43ea3510432 -lib/libxslt.lib: ae3fb6fd41bcc83e99eb833d7f11312c -lib/libxslt_a.lib: 5b6184ab67226653a619992d2e66d30a +lib/libexslt.lib: 574b83bbe26eca748519e1e2ef2ad50a +lib/libxslt.lib: 2a550274770dc3a3ae6611acc2466cf9 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt index 655972a0..a9c74e01 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt @@ -1,8 +1,8 @@ -1563314384 -bin/libexslt.dll: e0f8b366523f930466733da6b10c8477 -bin/libxslt.dll: f00b9c502cc7a684a7f479a8f7500ee8 -bin/xsltproc.exe: a4517cf3425c2240a9a1656cac8b0d61 -conaninfo.txt: 4ec410e069cb83d8a1364e503ef5e869 +1564656268 +bin/libexslt.dll: 0cd198fb320233108fddee3ec09bc377 +bin/libxslt.dll: 54cb08fddcb054636a8075e00e0bc883 +bin/xsltproc.exe: e874bb0ee567a308e9a9fde668a0702e +conaninfo.txt: bcb10215b78158b38fd56dadc574ca72 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -32,8 +32,6 @@ include/libxslt/xsltconfig.h: b650a6d45e6a25c2b6a855e881c57f2c include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -lib/libexslt.lib: 62a9bb46b41162952efeaa60ef7bab1c -lib/libexslt_a.lib: c92bb2cea4ca81635b84f156c05ec86d -lib/libxslt.lib: a8b2e5f594f4b9c0b685dd742778fcc7 -lib/libxslt_a.lib: 8448d05a7195909bbabbe069855fc9b9 +lib/libexslt.lib: f0201dd318f087f040abe3361adc6041 +lib/libxslt.lib: 3ca1e0c7dc446c2b547593d2243052c2 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt index c36a1022..a5f648f7 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt @@ -1,8 +1,8 @@ -1563314840 -bin/libexslt.dll: 4141dfa25d865a0cee1b59fe424acc3d -bin/libxslt.dll: 43556087a0f9ef6644fedb03b7a0b290 -bin/xsltproc.exe: 777526f819fe1316100b90b29d442bae -conaninfo.txt: 9215fe709c0363a6446192bdbf7be8b0 +1564656635 +bin/libexslt.dll: 5c4d6d1be796247772c3b2e64847e21a +bin/libxslt.dll: 3153114bfd1f64870f6523d2643b58db +bin/xsltproc.exe: 31f2b7049e0a5e168358a03d2cfb2e3a +conaninfo.txt: 2970ef8cccdfe7e239697f31c737af3c include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -33,7 +33,5 @@ include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 lib/libexslt.lib: a6856e7a6c5bf5a3219d20f6a4196af7 -lib/libexslt_a.lib: a8c039f9ec02c10bbe0b4e7d7b64c7c2 lib/libxslt.lib: c92f8017146bd83d247fa2923fefad40 -lib/libxslt_a.lib: 35d4de952df68733c2e4d483cc60ab9a licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt index a931af23..9df383f3 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt @@ -1,9 +1,9 @@ -1563315535 -bin/libexslt-0.dll: cab6eb3a57d592d0c6556772e75bc091 -bin/libxslt-1.dll: 1b237a7dca37e8be1a2b7644b4e32f2a +1564657192 +bin/libexslt-0.dll: 5b1aa1e3f0b7420e460bd2ba7c0905b7 +bin/libxslt-1.dll: 304fe2300204c90d4f9ff63489d69037 bin/xslt-config: 40811a2730bb0b6542758cff609476a4 -bin/xsltproc.exe: 7f47496605bb3c31198b2028295e41cb -conaninfo.txt: 98809b81082a2638531dca7c3c6b8196 +bin/xsltproc.exe: 4816b9ff0fe4dcc89c57c2e3fab9ea1f +conaninfo.txt: 0e255efc593a041926b319133858565c include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: 0ecd038f6193e48046754b4c19c5100a include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -28,9 +28,9 @@ include/libxslt/xsltconfig.h: 05fef7eabdf530bd4187f2ab36f75ab2 include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -lib/libexslt.dll.a: 83bc04597cc3a197ad757f5a76cd3cf8 +lib/libexslt.dll.a: 9bd0029908c64166fc25a8f9768a9899 lib/libexslt.la: 0cb3b2219e4d584e600e7c8c2793c17f -lib/libxslt.dll.a: 7e6d45f7f66e7095e0706a8cb487b2ad +lib/libxslt.dll.a: 19e51032012443406f5baa4cbc9f2fc0 lib/pkgconfig/libexslt.pc: bf17f17059d9835bd023402072aae276 lib/pkgconfig/libxslt.pc: d44ef86e4b636bfdb470a0abac21ea2c lib/xsltConf.sh: 6592ea47fbdda09eda481af47695c07e diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt index 16a5f30e..e68abb87 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt @@ -1,9 +1,9 @@ -1563315757 -bin/libexslt-0.dll: 8246da72c1d928df83645852d0aad04d -bin/libxslt-1.dll: 4313a0eef07d9f23605018a709f094ef +1564657427 +bin/libexslt-0.dll: 833bc209ca4345e34a91747b902561a8 +bin/libxslt-1.dll: 664ee7f047e6f16dcbcf81b7244f0574 bin/xslt-config: 8da5db250243d255558b3e78442b2509 -bin/xsltproc.exe: a71a65dbab3e694b8aea4a6a7f115c29 -conaninfo.txt: ae8f13739b7fa8ffd7f6802c7de8d097 +bin/xsltproc.exe: 748e52a2a7ac0424a8be0aca0e1a3721 +conaninfo.txt: bb58ef48f7e3996938a57377e073c849 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: 0ecd038f6193e48046754b4c19c5100a include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -28,9 +28,9 @@ include/libxslt/xsltconfig.h: 57168ad99e4e28bcfeea713ead5cea37 include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 -lib/libexslt.dll.a: 4115a89bfabd8b730ff512618fb73cd9 +lib/libexslt.dll.a: c6b6ba9f72c57f2737cb58744db48cce lib/libexslt.la: 64bd984341b00db0bef87e5452b8a52c -lib/libxslt.dll.a: 235305b53da66753ff5f80e481084d49 +lib/libxslt.dll.a: 9c6d3367a2c9d81da888aec728595158 lib/pkgconfig/libexslt.pc: 96de8f80e8e66cc6fa593aaaae8f0d79 lib/pkgconfig/libxslt.pc: ca661115f87755258b6c925774d0bc04 lib/xsltConf.sh: 9fcd150c391ae3fba108aa9ec272601b diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt index 72fc7217..c4697d0a 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.33/qtproject/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt @@ -1,8 +1,8 @@ -1563314699 -bin/libexslt.dll: 2f6c1b0675b471626eb6b059c62dc47d -bin/libxslt.dll: ce6e74e9f547eb8075a38217fce288bc -bin/xsltproc.exe: 6b622ec4f565be591db0a1512e62afd0 -conaninfo.txt: c5e083fe93cb280366b4719ebc623f14 +1564656516 +bin/libexslt.dll: 3a90a85d74d278313c61201a5c93c400 +bin/libxslt.dll: 15647e2321ca68c2967b669a63e1b107 +bin/xsltproc.exe: ac0db93df3f4d40b628285c69f20a56b +conaninfo.txt: 8871cf3a8be8aaedae333c30219d4169 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: b59169f8160a77fbe1f2a5857b0d3575 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -33,7 +33,5 @@ include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 lib/libexslt.lib: b42f86d1df0d2ea5acdab2358ce0e342 -lib/libexslt_a.lib: ede1e3dd3681e09f5aebb24c1f27f34a lib/libxslt.lib: e27ebe0519adda4e86bdb7c66084dd5f -lib/libxslt_a.lib: cee614fe2761af1dc0ad4a5ab3da444f licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 -- cgit v1.2.3 From 1fbba6d1ce2e65b1ec466736e50ccfa617e7e53a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Aug 2019 09:50:44 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ifa9d7423aeb8bbc179dd31b38c5b1368c8f54146 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index d2c52680..d0d05922 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d2c52680884095238ec3859fabaad03157af3985 +Subproject commit d0d05922ed34011eca3c975d5653c14628344a24 diff --git a/qtbase b/qtbase index 76be8193..d914a5ba 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76be819345228d589cbc4f5129617151ea604750 +Subproject commit d914a5ba4e2f0c208473d5e76adb7d16e2e8e706 diff --git a/qtdeclarative b/qtdeclarative index 42872e72..4bac72aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42872e720b2d25501587b0ed95f183d2dd9c8441 +Subproject commit 4bac72aa13e6818460f6b71127d3af5bd7e00ca5 diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 diff --git a/qtserialbus b/qtserialbus index b8dbe552..fd9b9c73 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b8dbe5524bd15ea0acc03dc5c5c4bf9f0d912f42 +Subproject commit fd9b9c73ca60c66d01376ddbd6d36e9ea2dfa95c diff --git a/qttools b/qttools index 61c0d801..4e668dca 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 61c0d8017044263dde21f1db57383f6d19f9eb03 +Subproject commit 4e668dcad5e09db346c41ad7ace8ff705eb8bc3c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 68375389..8af01ac9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 68375389bf09427103ab3ff2b7fb1517e9b55615 +Subproject commit 8af01ac984908ba58e682263187b2ceb5faf2f8f diff --git a/qtwayland b/qtwayland index ae43ed46..a2adfcd5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ae43ed466e62cc198b7ab85c7f40faaada39c968 +Subproject commit a2adfcd59093ac0aabad2878c719f1705df93020 diff --git a/qtwebengine b/qtwebengine index 33a2c9ae..f383f899 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 33a2c9aed3ee621c91853570087b500c830792e0 +Subproject commit f383f899cba71c02f2fcacd7f54b17a50f8e33d0 -- cgit v1.2.3 From 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Aug 2019 22:30:57 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e Reviewed-by: Qt Submodule Update Bot --- qtqa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtqa b/qtqa index cacf0675..da16b930 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 +Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f -- cgit v1.2.3 From 4c609c4db337dd6d5029a821752bd467c29bc890 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Aug 2019 23:01:09 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I83e4cfe7c9598e4454b2007c993413d85f7a3785 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtserialbus | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index d914a5ba..1932754e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d914a5ba4e2f0c208473d5e76adb7d16e2e8e706 +Subproject commit 1932754e901792b68690863612648b76077edf57 diff --git a/qtdeclarative b/qtdeclarative index 4bac72aa..55a0fe45 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4bac72aa13e6818460f6b71127d3af5bd7e00ca5 +Subproject commit 55a0fe4539e2a9ac934bb02cdb935389a26f74ad diff --git a/qtlocation b/qtlocation index f8694e1f..011198e5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f8694e1f3430b7851fc90e26c6d778a86219379a +Subproject commit 011198e588774ecf86f692e54aad9c30dcab5a67 diff --git a/qtmultimedia b/qtmultimedia index 43555769..d89a4269 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 435557691c3c28e9c63aa4bb5f4b9ec8fe3f8923 +Subproject commit d89a4269ce1d9729842a508d97e1f1aeaf7305ee diff --git a/qtqa b/qtqa index cacf0675..da16b930 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 +Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f diff --git a/qtserialbus b/qtserialbus index fd9b9c73..1bac9b37 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fd9b9c73ca60c66d01376ddbd6d36e9ea2dfa95c +Subproject commit 1bac9b37a9982eb5bf44f0fb16f580c2c1c1d959 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8af01ac9..e342f136 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8af01ac984908ba58e682263187b2ceb5faf2f8f +Subproject commit e342f1366eff06f3cf01991b377c880b2d246177 diff --git a/qtwayland b/qtwayland index a2adfcd5..1b5e97ee 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a2adfcd59093ac0aabad2878c719f1705df93020 +Subproject commit 1b5e97ee6d9368ed27519d26bb9adcff64d8adb1 -- cgit v1.2.3 From fde090e4b5e1f67201d321814af2a43bd546613c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Jul 2019 14:52:44 +0300 Subject: Add targets for yocto builds Add empty linux targets that are used by the yaml file from meta-boot2qt and meta-qt5 Fixes: COIN-320 Change-Id: I574185345a3c3dec0a033e7faed45091b89d4959 Reviewed-by: Aapo Keskimolo --- coin/platform_configs/meta-boot2qt.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 coin/platform_configs/meta-boot2qt.txt diff --git a/coin/platform_configs/meta-boot2qt.txt b/coin/platform_configs/meta-boot2qt.txt new file mode 100644 index 00000000..dbf41fcf --- /dev/null +++ b/coin/platform_configs/meta-boot2qt.txt @@ -0,0 +1,12 @@ +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +------------------------------ --------- ----------- -------- --------------- -------- ------------------- +qtci-linux-Ubuntu-18.04-x86_64 TARGET1 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET2 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET3 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET4 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET5 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET6 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET7 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET8 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET9 Yocto +qtci-linux-Ubuntu-18.04-x86_64 TARGET10 Yocto -- cgit v1.2.3 From 9da27c5808b6f5eda84ef75ce96a0259c7d92d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 2 May 2019 10:22:00 +0300 Subject: Add macOS 10.14 to the CI Task-number: QTQAINFRA-2938 Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 5 + .../common/macos/install_openssl_111a.sh | 78 ++++++++++++ .../01-sha1sum-compatibility.sh | 41 ++++++ .../qtci-macos-10.14-x86_64/03-bashprofile.sh | 7 ++ .../qtci-macos-10.14-x86_64/05-systemsetup.sh | 92 ++++++++++++++ .../qtci-macos-10.14-x86_64/06-crashreporter.sh | 5 + .../06-disable_spotlight.sh | 5 + .../06-disable_update_downloads.sh | 4 + .../qtci-macos-10.14-x86_64/07-SSL_keychain.sh | 9 ++ coin/provisioning/qtci-macos-10.14-x86_64/15-xz.sh | 52 ++++++++ .../qtci-macos-10.14-x86_64/20-java.sh | 5 + .../qtci-macos-10.14-x86_64/20-xcode.sh | 53 ++++++++ .../21-install-commandlinetools.sh | 47 +++++++ .../qtci-macos-10.14-x86_64/25-cmake.sh | 6 + .../qtci-macos-10.14-x86_64/25-homebrew.sh | 6 + .../qtci-macos-10.14-x86_64/25-mysql.sh | 58 +++++++++ .../provisioning/qtci-macos-10.14-x86_64/25-pip.sh | 6 + .../qtci-macos-10.14-x86_64/25-postgresql.sh | 57 +++++++++ .../qtci-macos-10.14-x86_64/25-python2.sh | 5 + .../qtci-macos-10.14-x86_64/25-python3.sh | 5 + .../qtci-macos-10.14-x86_64/26-odbc.sh | 7 ++ .../qtci-macos-10.14-x86_64/26-p7zip.sh | 7 ++ .../qtci-macos-10.14-x86_64/27-libclang.sh | 7 ++ .../qtci-macos-10.14-x86_64/30-android.sh | 85 +++++++++++++ .../provisioning/qtci-macos-10.14-x86_64/30-fbx.sh | 7 ++ .../qtci-macos-10.14-x86_64/35-install-breakpad.sh | 6 + .../35-install_protobuff.sh | 40 ++++++ .../qtci-macos-10.14-x86_64/35-openssl.sh | 6 + .../qtci-macos-10.14-x86_64/40-qnx700.sh | 57 +++++++++ .../qtci-macos-10.14-x86_64/55-signtools.sh | 138 +++++++++++++++++++++ .../qtci-macos-10.14-x86_64/90-squish.sh | 6 + .../qtci-macos-10.14-x86_64/99-mac-version.sh | 6 + 32 files changed, 918 insertions(+) create mode 100755 coin/provisioning/common/macos/install_openssl_111a.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/01-sha1sum-compatibility.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/03-bashprofile.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/06-crashreporter.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/06-disable_spotlight.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/06-disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/07-SSL_keychain.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/15-xz.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/20-java.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-cmake.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-mysql.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-pip.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-postgresql.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/25-python3.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/26-odbc.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/26-p7zip.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/27-libclang.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/30-fbx.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/35-install_protobuff.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/99-mac-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ce4394fb..d2aa8f10 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -85,6 +85,11 @@ Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.12-x86_64-9' Compiler: 'Clang' diff --git a/coin/provisioning/common/macos/install_openssl_111a.sh b/coin/provisioning/common/macos/install_openssl_111a.sh new file mode 100755 index 00000000..cd6cd9e8 --- /dev/null +++ b/coin/provisioning/common/macos/install_openssl_111a.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script install OpenSSL + +set -ex + +# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +opensslVersion="1.1.1a" +opensslFile="openssl-$opensslVersion.tar.gz" +opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" +opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" +opensslSha1="8fae27b4f34445a5500c9dc50ae66b4d6472ce29" + +# Below target location has been hard coded into Coin. +# QTQAINFRA-1195 +openssl_install_dir=/usr/local/openssl-$opensslVersion +opensslTargetLocation="/usr/local/opt/openssl" + +InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" +cd "/tmp/openssl-$opensslVersion" +sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack" + +sudo make install_sw install_ssldirs + +path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') +sudo mkdir -p "$path" +sudo ln -s $openssl_install_dir $opensslTargetLocation + +SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" +SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" + +SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" +SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" +SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" + +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null + +sudo rm -rf /tmp/openssl-$opensslVersion + +echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000..52650fea --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,41 @@ +#!/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$ +## +############################################################################# + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-10.14-x86_64/03-bashprofile.sh new file mode 100755 index 00000000..2c3e45f3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/03-bashprofile.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env sh + +set -ex + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh new file mode 100755 index 00000000..817e3858 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh @@ -0,0 +1,92 @@ +#!/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 + +# This script modified system settings for automated use + +VNCPassword=qt +NTS_IP=10.212.2.216 + +echo "Disable Screensaver" +# For current session +defaults -currentHost write com.apple.screensaver idleTime 0 + +echo "Disable sleep" +sudo pmset sleep 0 displaysleep 0 + +# For session after a reboot +mkdir -p "$HOME/Library/LaunchAgents" +cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" < + + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT + +defaults write com.apple.screensaver askForPassword -int 0 + +echo "Set keyboard type rates and delays" +# normal minimum is 15 (225 ms) +defaults write -g InitialKeyRepeat -int 15 +# normal minimum is 2 (30 ms) +defaults write -g KeyRepeat -int 2 + +echo "Enable remote desktop sharing" +sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT +sudo systemsetup setusingnetworktime off diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-10.14-x86_64/06-crashreporter.sh new file mode 100755 index 00000000..8461c656 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/06-crashreporter.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env sh + +set -ex + +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_spotlight.sh new file mode 100755 index 00000000..67e2c1f6 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_spotlight.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_update_downloads.sh new file mode 100755 index 00000000..3c11214d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/06-disable_update_downloads.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.14-x86_64/07-SSL_keychain.sh new file mode 100755 index 00000000..6e7c796a --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/07-SSL_keychain.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +set -ex + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +# Enables the usage of temporary keychains for SSL autotests +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.14-x86_64/15-xz.sh new file mode 100755 index 00000000..9a667c64 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/15-xz.sh @@ -0,0 +1,52 @@ +#!/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 installs XZ-Utils + +# XZ-Utils are needed for uncompressing xz-compressed files + +set -ex + +# shellcheck source=../common/macos/InstallPKGFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" +AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" +SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +echo "XZ = 5.0.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-java.sh new file mode 100755 index 00000000..dcfcb93b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-java.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh new file mode 100755 index 00000000..ebeadc02 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -0,0 +1,53 @@ +#!/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 installs Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_9.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_9.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you five files called "Content.part<00..05>.cpio.xz". +# Extract those that have the extension .xz with xz. +# "cat" together all the content files "cat file1, file2, file3, file4, file5 >file_new" +# Compress the new file with xz back to something like Xcode_9.xz +# Upload the file to temporary storage for this script to use. + +set -ex + +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" + +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh new file mode 100755 index 00000000..09055ee6 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -0,0 +1,47 @@ +#!/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/macos/install-commandlinetools.sh +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" + +version="10.2.1" +packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" +sha1="18fea89bb743107aee372a212be608d6e35fdecf" + +InstallCommandLineTools $url $url $sha1 $packageName $version + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-cmake.sh new file mode 100755 index 00000000..4f4d405e --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-cmake.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh new file mode 100755 index 00000000..06e984ec --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-mysql.sh new file mode 100755 index 00000000..d873499c --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-mysql.sh @@ -0,0 +1,58 @@ +#!/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 installs MySQL + +# MySQL is needed for Qt to be able to support MySQL + +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" +SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" +appPrefix="" +targetDir="/opt/mysql57/" + +sudo mkdir -p "/opt" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" + +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" +echo "MySQL = 5.7.15" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-pip.sh new file mode 100755 index 00000000..86db3e27 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-pip.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-postgresql.sh new file mode 100755 index 00000000..e59f0f03 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-postgresql.sh @@ -0,0 +1,57 @@ +#!/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 installs PostgreSQL + +# PostgreSQL is needed for Qt to be able to support PostgreSQL + +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +psqlVersion="9.6.0" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" +AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" +SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" +appPrefix="" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" +echo "PostgreSQL = $psqlVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-python2.sh new file mode 100755 index 00000000..7ebb8825 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-python2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +# shellcheck source=../common/macos/python2.sh +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-python3.sh new file mode 100755 index 00000000..eb2a4863 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-python3.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +# shellcheck source=../common/macos/python3.sh +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-odbc.sh new file mode 100755 index 00000000..2aedfe7b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-odbc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libiodbc + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-p7zip.sh new file mode 100755 index 00000000..15511332 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-p7zip.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install 7z to be used from command line + +set -ex + +brew update +brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.14-x86_64/27-libclang.sh new file mode 100755 index 00000000..aad628cb --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/27-libclang.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# There is only one mac package and common script uses it as a default +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh new file mode 100755 index 00000000..c0d75ff6 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -0,0 +1,85 @@ +#!/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 install Android sdk and ndk. + +# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version + +set -ex + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +targetFolder="/opt/android" +sdkTargetFolder="$targetFolder/sdk" + +basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" + +toolsVersion="r26.1.1" +# toolsFile dertermines tools version +toolsFile="sdk-tools-darwin-4333796.zip" + +ndkVersion="r18b" +ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" +sdkBuildToolsVersion="28.0.3" +# this is compile sdk version +sdkApiLevel="android-28" + +toolsSourceFile="$basePath/$toolsFile" +ndkSourceFile="$basePath/$ndkFile" + +echo "Unzipping Android NDK to '$targetFolder'" +sudo unzip -q "$ndkSourceFile" -d "$targetFolder" +echo "Unzipping Android Tools to '$sdkTargetFolder'" +sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" + +echo "Changing ownership of Android files." +sudo chown -R qt:wheel "$targetFolder" + +echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." +(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + +echo "Checking the contents of Android SDK..." +ls -l "$sdkTargetFolder" + +SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" +SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" +SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" + +echo "Android SDK tools = $toolsVersion" >> ~/versions.txt +echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt +echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt +echo "Android NDK = $ndkVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-fbx.sh new file mode 100755 index 00000000..34eefeb6 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-fbx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/fbx_macos.sh" + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-install-breakpad.sh new file mode 100755 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-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-macos-10.14-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-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-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh new file mode 100755 index 00000000..cf312ed2 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/install_openssl_111a.sh +source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh new file mode 100755 index 00000000..a5547972 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -0,0 +1,57 @@ +#!/bin/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 installs QNX 7. + +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +folderName="qnx700" + +sudo mkdir -p "$targetFolder" + +echo "Extracting QNX 7" +sudo unzip -q "$sourceFile" -d "$targetFolder" + +sudo chown -R qt:wheel "$targetFolder"/"$folderName" + +# Verify that we have last file in zip +if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + exit 1 +fi + +# Set env variables +echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc +echo "QNX SDP = 7.0.0" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh new file mode 100755 index 00000000..0b8595a0 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh @@ -0,0 +1,138 @@ +#!/usr/bin/env sh + +############################################################################# +## +## 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$ +## +############################################################################# + +# Install tools for singing packages +# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. + +set -ex + +cache="http://ci-files01-hki.intra.qt.io/input" +cacheSigningTools="$cache/mac/sign_tools" +targetFolder="/Users/qt" +keychains="$targetFolder/Library/Keychains" + +Install() { + + url=$1 + targetFile=$2 + expectedSha1=$3 + + echo "Fetching $targetFile from $url..." + curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" + shasum "$targetFile" |grep "$expectedSha1" + +} + +# qt-license +sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" +Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense + +# Login keychain +sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" +{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null +loginKeychain=$keychains/login.keychain + +echo "Setting login.keychain as default keychain.." +security default-keychain -s $loginKeychain* +echo "Unlocking Login keychain with password.." +{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null + +echo "remove the "Lock after X minutes of inactivity" from login.keychain" +security set-keychain-settings $loginKeychain + +# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer +sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" +Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" + +# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer +sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" +Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" + +# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' +sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" +unlockKeychain=$targetFolder/unlock-keychain.sh +{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null +sudo chmod 755 "$unlockKeychain" + +# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. +shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" +csreq=$targetFolder/csreq_qt_company.txt +Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq +chmod 755 "$csreq" + +# iOS signing tools +devIDKeychain="Developer_ID_TheQtCompany.keychain" +shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca" +Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain +echo "Opening $devIDKeychain.." +open "$keychains/$devIDKeychain" + +sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" +Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" +{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null + +echo "Unlocking $devIDKeychain with password.." +{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null +security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain + +sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null +{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null + +iPhoneDeveloper="iosdevelopment_2019.p12" +shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +echo "Importing $iPhoneDeveloper.." +{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null + +iPhoneDistribution="iosdistribution_2019.p12" +shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +echo "Importing $iPhoneDistribution.." +{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null + +# Mobileprovision +echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." +mkdir "$targetFolder/Library/MobileDevice" +mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" +shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" +Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision + +# Removing password files +rm -fr "$targetFolder/login_keychain_password.txt" + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.14-x86_64/90-squish.sh new file mode 100755 index 00000000..17a0c38e --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/90-squish.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.14-x86_64/99-mac-version.sh new file mode 100755 index 00000000..99d94150 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/99-mac-version.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/macos-version.sh -- cgit v1.2.3 From cb14d29efe8db42994fe6a032ce45a5c7ae19a8f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Aug 2019 23:00:52 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I72ceb9f1c47f5786a8a061b744e085aadb5e17a2 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwayland | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 1932754e..49a8aae6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1932754e901792b68690863612648b76077edf57 +Subproject commit 49a8aae6d3b254a0e1dcc3f997b6eb2dd1e6c7b7 diff --git a/qtcharts b/qtcharts index 9a052d7a..ff84fb0f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9a052d7a7e56d312fa52eaef7ff7844ec7019783 +Subproject commit ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd3 diff --git a/qtdeclarative b/qtdeclarative index 55a0fe45..924beea1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 55a0fe4539e2a9ac934bb02cdb935389a26f74ad +Subproject commit 924beea1617e67faf234d304a0592d71490d41bd diff --git a/qtlocation b/qtlocation index 011198e5..44757c53 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 011198e588774ecf86f692e54aad9c30dcab5a67 +Subproject commit 44757c534b950e2fca2d56d0ab4228b4123cf080 diff --git a/qtquickcontrols b/qtquickcontrols index b74071e6..6ab10d97 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b74071e607e824d3adbe6bfbe0c9a720f91f3662 +Subproject commit 6ab10d971d7d98eeaa50203c24d53da35cfe2187 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2ee78aaf..92c827a2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2ee78aafc81cd35073e9d90c9186e81676dea2ac +Subproject commit 92c827a2a4b7e56dcb6865fa35fba25b5d2eb87f diff --git a/qtremoteobjects b/qtremoteobjects index 35516bfe..d71556d5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 35516bfec49c5da9b0e6bcd0731bb5d5b7983944 +Subproject commit d71556d50498548a6b765c6c7bb9d997813fc7f3 diff --git a/qttools b/qttools index 4e668dca..c83bf647 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4e668dcad5e09db346c41ad7ace8ff705eb8bc3c +Subproject commit c83bf647fb84f0bee5cc9894dd0c58f661194932 diff --git a/qtwayland b/qtwayland index 1b5e97ee..52b65607 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1b5e97ee6d9368ed27519d26bb9adcff64d8adb1 +Subproject commit 52b6560708ebcfeeaebdf2b43f368c610aa905a4 -- cgit v1.2.3 From 2970d3660c86c2daa6202e7c280aafcba64e5382 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Aug 2019 22:30:47 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index d6a01d04..2069724d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d6a01d04f77f15e2847875b37412eb2814d723f9 +Subproject commit 2069724dbd28c3547749d175d1a36d7752db7742 diff --git a/qtimageformats b/qtimageformats index adc70a52..d72ff0cd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit adc70a5244a8a7c3d554cbcfc3f38f8396974900 +Subproject commit d72ff0cd09eda68a0579dc57389ecc1ee4a3b7c8 diff --git a/qtmultimedia b/qtmultimedia index dbdcc1b0..2da4e162 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dbdcc1b099dc25ffb707a2441191463de33c51f3 +Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 -- cgit v1.2.3 From 2fb0e4f3521327d7d44b012316fb9e79c11f4366 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Aug 2019 22:31:11 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtremoteobjects | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 4d727108..4f116f00 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4d7271087e84096abd75fa806bea234daee0cd94 +Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 diff --git a/qtdoc b/qtdoc index 2069724d..2b710e89 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2069724dbd28c3547749d175d1a36d7752db7742 +Subproject commit 2b710e89fa7a1ce71bd98185580d9498af652a6e diff --git a/qtremoteobjects b/qtremoteobjects index 6ccba37d..ff2c16f4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6ccba37dedcb37507fd1ab3c72e576c0b005e572 +Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 -- cgit v1.2.3 From b41a217f35e7775303af8aaa6d8fd404a2d3409c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Aug 2019 23:01:11 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ic29d83fa0488cc77726adde23f21c68f0d7fecc3 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtserialport | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index d0d05922..2efe9d73 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d0d05922ed34011eca3c975d5653c14628344a24 +Subproject commit 2efe9d733c162f425c993c586f524e9d1de88f31 diff --git a/qtbase b/qtbase index 49a8aae6..bbff7018 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 49a8aae6d3b254a0e1dcc3f997b6eb2dd1e6c7b7 +Subproject commit bbff70181fc3c2b56489ad4fc0b0dea18a75b70a diff --git a/qtdeclarative b/qtdeclarative index 924beea1..5f530c25 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 924beea1617e67faf234d304a0592d71490d41bd +Subproject commit 5f530c252b3ca0a358c3f6e46add0f83ab8ebf2e diff --git a/qtremoteobjects b/qtremoteobjects index d71556d5..d88c6a16 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d71556d50498548a6b765c6c7bb9d997813fc7f3 +Subproject commit d88c6a1690d1d725e4436537546b3d5681ee4a9f diff --git a/qtserialport b/qtserialport index ad262832..b97dd9ea 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ad2628329e1685dbccd0ac3c5011336cd2c4f786 +Subproject commit b97dd9ea7a8e9aeeb63dcf173afa722f37d9a573 -- cgit v1.2.3 From 2b738468de025372806b32e23883454767bee3f9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Aug 2019 11:50:33 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3 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 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 7e60b6d5..e1f988f4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 +Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b diff --git a/qtactiveqt b/qtactiveqt index 6746b4c3..8168e8c7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6746b4c3736eb08721e68f3a051bf27b699487f3 +Subproject commit 8168e8c7447a9889554a587ba8c78fc7ba716eb8 diff --git a/qtandroidextras b/qtandroidextras index c158f8d5..9cc4df84 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c158f8d5179957084fd7ec1c2f97086b45604f56 +Subproject commit 9cc4df84fa778aeac0c391064fffc8b018c8f5c2 diff --git a/qtbase b/qtbase index 28af6e97..4f116f00 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 +Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 diff --git a/qtcharts b/qtcharts index aa765c1b..0bebc937 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit aa765c1b7802746e6a97043b62a142eb2d2137af +Subproject commit 0bebc937ce87bf28d815444e720e17619c916a91 diff --git a/qtconnectivity b/qtconnectivity index 96dd4e7f..37cd27fa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 96dd4e7ff0b10ac79798f1ae63db716bcc199e87 +Subproject commit 37cd27fac015d8d3b823321a2e2f04826ea844b4 diff --git a/qtdatavis3d b/qtdatavis3d index 3206729a..ddc28d06 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3206729aa704d9c7cdfaa734f177334d5c11ae72 +Subproject commit ddc28d060d2ae05f221d779bdd04e18f282aa090 diff --git a/qtdeclarative b/qtdeclarative index aeec2f94..6c19dd89 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aeec2f94c376c9a0e84bbbb3be4652384c7da113 +Subproject commit 6c19dd8989895b29a3f0b46871ed5f360e7b3440 diff --git a/qtdoc b/qtdoc index 6fbbbfd6..03ba767b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6fbbbfd69274507eae820959bd187c7b565e9d4a +Subproject commit 03ba767b36789489f46cce1ca19219dd409fbb74 diff --git a/qtgamepad b/qtgamepad index 027a1dfd..28385f28 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 027a1dfd3eca382dab3f3f17e7f43ccb84e329be +Subproject commit 28385f28cbe11d367e78b497625bb8a282cd4bd4 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3b3b3f85..52d3083d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3b3b3f85ddd472bdae168f210e62dc2868997aae +Subproject commit 52d3083d3ac1154414245187ad5bcc65d69c0145 diff --git a/qtimageformats b/qtimageformats index adc70a52..efe5998c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit adc70a5244a8a7c3d554cbcfc3f38f8396974900 +Subproject commit efe5998c3d9121e18660f3105b9ae144c3232ff5 diff --git a/qtmacextras b/qtmacextras index f44061fa..0e854fa1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f44061fa0547d048661d1efa8444da7c757fa39c +Subproject commit 0e854fa114aec06c3d77b19d5c2712154cdc2c33 diff --git a/qtmultimedia b/qtmultimedia index dbdcc1b0..2da4e162 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dbdcc1b099dc25ffb707a2441191463de33c51f3 +Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 diff --git a/qtnetworkauth b/qtnetworkauth index c2bf9b42..d7931d73 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c2bf9b420f29e4b001d6f85b918be5fb89c87564 +Subproject commit d7931d733e679c00c313ecff89052ed59bf49c30 diff --git a/qtpurchasing b/qtpurchasing index a0f911a2..6ef05a39 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit a0f911a29eb055de1e9dc2d3e78a1f03ccead5da +Subproject commit 6ef05a39b1ac00496ead66c8e143a05078e148e8 diff --git a/qtqa b/qtqa index 21586570..da16b930 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 +Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f diff --git a/qtquickcontrols b/qtquickcontrols index 845cd17a..8f4eb455 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 845cd17a498d6008992b04ec4ca1984e6e73de3c +Subproject commit 8f4eb455f93fa582a041c49595903eed81c59924 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 200b4751..7c2ec7dc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 200b47519ffc61ebd06cda9a4c452d7b15e37d33 +Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee diff --git a/qtremoteobjects b/qtremoteobjects index 6ccba37d..ff2c16f4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6ccba37dedcb37507fd1ab3c72e576c0b005e572 +Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 diff --git a/qtscript b/qtscript index 91234654..fbf37dd7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 912346548c774cdcc4383cc30e06f106dbf77a97 +Subproject commit fbf37dd7fa79509aec1d202c77331b0c4114488a diff --git a/qtsensors b/qtsensors index 6390e165..4c65318c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6390e165dc2df3bc48c3655ed45d1b952d1f2bae +Subproject commit 4c65318cd544980524aa600f4b4e3f97e6b46e0b diff --git a/qtserialbus b/qtserialbus index 5d82bf36..bf3fe510 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5d82bf36c526d55951127c95d8c0aa5abc2e199d +Subproject commit bf3fe5100df93369997aa9bf3f9ca71c3a908cca diff --git a/qtserialport b/qtserialport index 335f1d02..5faf8cc2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 335f1d02dc134bf11277c0573553c7c838cc6a9f +Subproject commit 5faf8cc2ea0f757327c23e086caa6309eebeaec3 diff --git a/qtspeech b/qtspeech index aa450db4..d3d2777f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit aa450db462db5fca847ed05c1e05c1779161cc8b +Subproject commit d3d2777fc868761609ef121ba3e88a20eb11df2b diff --git a/qttools b/qttools index 6d19911c..6a04f888 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6d19911c0db508a1c0079890a0adc8f6ab87bcf7 +Subproject commit 6a04f888b7bece2b4276ba6d55073c06e8d4f652 diff --git a/qtwebchannel b/qtwebchannel index c5d4f9b1..81b39fbe 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c5d4f9b1a653a242b6231cbdea8ccfc751180beb +Subproject commit 81b39fbe9eb4dbfff34ff9c3e6017eea12bf76ce diff --git a/qtwebglplugin b/qtwebglplugin index 95957bbe..27495743 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 95957bbecc40e5efb163ab123c2a7d8d04005bef +Subproject commit 27495743080cbf0ff7fef2f83f82362d147ae519 diff --git a/qtwebsockets b/qtwebsockets index 0634c810..e406bf83 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0634c8104558dbb7acd314d52cf4b039c8c3689d +Subproject commit e406bf83a963cb1efae6a5869fc5a2a62249a6cf diff --git a/qtwebview b/qtwebview index 5c80bba0..13dfe272 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5c80bba07d09f498027586a32b0f937d26cca1dd +Subproject commit 13dfe272a387a2f56229df916a580ab9ac92e332 diff --git a/qtwinextras b/qtwinextras index da9ce653..07f43f05 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit da9ce653ee04b9b93cfa95d4d7071d0153286c71 +Subproject commit 07f43f05d3ed8e54e4a62b20b958644f58fab7fc diff --git a/qtx11extras b/qtx11extras index d6090610..839e33dc 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d6090610969cd7f2f5554e6239b0e35f8755196a +Subproject commit 839e33dc17d24ec41bb95b76ef6ed208d8f4f492 diff --git a/qtxmlpatterns b/qtxmlpatterns index 84e44bf5..04e770cf 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a +Subproject commit 04e770cfbafa16c09dd527897bfac2a457b47644 -- cgit v1.2.3 From f511a2d74ff298989d48a1ee409b0de1e4d21869 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 12:10:20 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650 Reviewed-by: Liang Qi --- qt3d | 2 +- qtlottie | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index e1f988f4..b9e24eee 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b +Subproject commit b9e24eee0f43061730445e5400aa6a5795774660 diff --git a/qtlottie b/qtlottie index 4c3207a7..86c7306e 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4c3207a7385a3ba402884bb50136bbe7b70baa2e +Subproject commit 86c7306ebc0d011a096f0554e0c206fe17bb577c diff --git a/qtqa b/qtqa index da16b930..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qttools b/qttools index 6a04f888..f4a51bac 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6a04f888b7bece2b4276ba6d55073c06e8d4f652 +Subproject commit f4a51baca04fdaa0fc6a1106db9f7dd91b5a3b2a -- cgit v1.2.3 -- cgit v1.2.3 From f08bd26eebe928b86cb1819126c232af02e10ab5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 309c3139..6388eb98 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 309c3139f8111ea246dd3a1f996578d0b35bb151 +Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 diff --git a/qtbase b/qtbase index 3d7bd7ad..36cc171b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d7bd7ad19254bb1c4794349e71501e58c91891e +Subproject commit 36cc171b9314bf77fc84d4273dceb6264aef7134 diff --git a/qtconnectivity b/qtconnectivity index c9d585da..406b18fd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c9d585da2ddd49108d7b56f480bcfc9d71b67dbf +Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c diff --git a/qtdeclarative b/qtdeclarative index dfc6dc1d..0647df8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dfc6dc1d94a729f701172861a196b4b34bcd7518 +Subproject commit 0647df8c88d4eaeedd19456b6e382308208e2be1 diff --git a/qtmultimedia b/qtmultimedia index d9dd7f48..636f46f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd +Subproject commit 636f46f04ba6d5c63783558ed78eb5f562179e9c diff --git a/qtqa b/qtqa index cacf0675..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qtwebengine b/qtwebengine index c3c37b4e..a2c365cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c3c37b4e93a26748497bec1a0dc29b8358408157 +Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 -- cgit v1.2.3 From b88acae7a8e773c307e44f84da037d01d19e60f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 8 Aug 2019 10:04:18 +0000 Subject: Partially revert 'Do DeveloperBuild for Boot2Qt' This partially reverts commit 8f073cea69dde52b66577de4417fbc34db9e7476. Autotests slow down way too much still, so we can't run developers builds eveywhere. Task-number: QTBUG-63152 Task-number: QTBUG-77304 Task-number: COIN-326 Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qtbase.yaml | 14 ++++++++++++++ coin/platform_configs/qtdeclarative.yaml | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index d2aa8f10..640196ad 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -136,13 +136,13 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index dbe93909..af68635a 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,3 +1,17 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-windows-10-x86_64-10' Target os: 'WinRT_10' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 7c4f6722..9327b92e 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,3 +1,15 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.3 From 42bfac5bf847cc7505d0bf5be2aff179ed2ed28e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Jul 2019 11:30:55 +0200 Subject: Include qtvirtualkeyboard again This partially reverts commit 452e0d94d40bba15a56293a0a0f7d093dececda9. Task-number: QTBUG-76371 Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8 Reviewed-by: Mitch Curtis --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9884474c..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -264,7 +264,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.12 - status = ignore + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.3 From 0f89c023282e677ddd457b16eb9d49e3e1f62748 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 8 Aug 2019 15:34:24 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 6c19dd89..02b47ec4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6c19dd8989895b29a3f0b46871ed5f360e7b3440 +Subproject commit 02b47ec4a5f956b45436e078fbc7505c664d3bea diff --git a/qtremoteobjects b/qtremoteobjects index ff2c16f4..085935e7 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 +Subproject commit 085935e7c2e7793ca915e64f2ed9d6ae37570e21 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6143eec2..d0cd3279 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6143eec2525af08e6aab895bcf64c2745a427f13 +Subproject commit d0cd32798fa9c36dc4294ed78596ed2b798d37f8 -- cgit v1.2.3 From f32c9f755edf4dd75ec8bd3066c11e37ab6e1e84 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 3 Aug 2019 12:47:03 +0200 Subject: Include QtWebEngine again This reverts commit a94696ccd5be936099809eda58db02999cb7c77a partially. Task-number: QTBUG-77304 Task-number: QTBUG-77305 Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28 Reviewed-by: Jani Heikkinen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c59f64ff..1aa79a80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = 5.13.1 - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative -- cgit v1.2.3 -- cgit v1.2.3 From 4230f4ac548be64b9f74b059415237ab578ab1fd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 8 Aug 2019 23:21:13 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ic8e437d68ed59391f9a0c5c73cc57298a109b02f Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 2efe9d73..9fab345f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2efe9d733c162f425c993c586f524e9d1de88f31 +Subproject commit 9fab345f26ddf8574cdf3c967609c01ff00d512c diff --git a/qtbase b/qtbase index bbff7018..c595878a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bbff70181fc3c2b56489ad4fc0b0dea18a75b70a +Subproject commit c595878aa34c5861b00f0c59bc4b0b6c02a54543 diff --git a/qtconnectivity b/qtconnectivity index f2f9da65..ccc1544f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f2f9da656fd77330cce44dfe0721b3f68f1d809d +Subproject commit ccc1544f5ff929f466df8c790a4e7595e177a720 diff --git a/qtdeclarative b/qtdeclarative index 5f530c25..d1b72c98 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5f530c252b3ca0a358c3f6e46add0f83ab8ebf2e +Subproject commit d1b72c98b4e617530bfb23c3a5b7ebc68c15c089 diff --git a/qtdoc b/qtdoc index 8d0bd28f..c7a53256 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8d0bd28f8134c479c78972ad9d1448a575c5ef72 +Subproject commit c7a53256d262ba58e59ebc3863c21c7b6cd2f0c8 diff --git a/qtimageformats b/qtimageformats index e7940d95..82a6d342 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e7940d951e211837ed45b759fb97282e8d65e4c5 +Subproject commit 82a6d3426215253e013dd3ddd6712488388bc926 diff --git a/qtlocation b/qtlocation index 44757c53..0a242cc0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 44757c534b950e2fca2d56d0ab4228b4123cf080 +Subproject commit 0a242cc026190432a115a82752ddf35b8be15de6 diff --git a/qtmultimedia b/qtmultimedia index d89a4269..9178132f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d89a4269ce1d9729842a508d97e1f1aeaf7305ee +Subproject commit 9178132f75563cd0e907525f08736c1b4cec73b4 diff --git a/qtpurchasing b/qtpurchasing index f58adac0..bc6d5686 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f58adac04ad8e36a840a66d14e02e5993b8099e7 +Subproject commit bc6d56861b93bd87958baa3384c3cbd895f1c3f9 diff --git a/qtqa b/qtqa index da16b930..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qtserialbus b/qtserialbus index 1bac9b37..556c6b67 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1bac9b37a9982eb5bf44f0fb16f580c2c1c1d959 +Subproject commit 556c6b67315c25f7e4359ab19314f3485f10ecc6 diff --git a/qtserialport b/qtserialport index b97dd9ea..bc4196f9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b97dd9ea7a8e9aeeb63dcf173afa722f37d9a573 +Subproject commit bc4196f908a96522ecaab078141364b3e10d1788 diff --git a/qttools b/qttools index c83bf647..83086517 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c83bf647fb84f0bee5cc9894dd0c58f661194932 +Subproject commit 8308651784dc591e1d07126bdff6e7a606ec618b -- cgit v1.2.3 From 3e396d5ef17c9a62a4da5ab4bba3713393ca61c5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 29 Jul 2019 17:49:02 +0200 Subject: Update qt5 wip/qt6 Point qtbase to wip/qt6. And use new sha1s for other repositories when needed. And update .gitmodules branch to point to wip/qt6. Change-Id: Ic12a106d1b491f77277419a27b61396ba07f1737 Reviewed-by: Simon Hausmann --- .gitmodules | 82 +++++++++++++++++++++++++++--------------------------- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.gitmodules b/.gitmodules index 88c9d120..cfd15d9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = wip/qt6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = wip/qt6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = wip/qt6 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = wip/qt6 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = wip/qt6 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = wip/qt6 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = wip/qt6 status = ignore priority = 10 [submodule "qtcanvas3d"] @@ -229,92 +229,92 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = wip/qt6 status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = wip/qt6 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = wip/qt6 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = wip/qt6 status = preview [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = wip/qt6 status = preview diff --git a/qt3d b/qt3d index 58db7d01..1b448781 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 58db7d01e0d424fdf46baa70e2e41b8009429c78 +Subproject commit 1b4487817e68a5e87eff54793b02c85792accc10 diff --git a/qtactiveqt b/qtactiveqt index be1aab20..62ed66bc 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit be1aab204340c1af23df1c393970f5d245ec0a33 +Subproject commit 62ed66bce6e6602d82f9474a8589a7dabd7bc9ca diff --git a/qtbase b/qtbase index bcd4b140..f44850b5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bcd4b14026094d0077ad1069054676cc6da96251 +Subproject commit f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 diff --git a/qtcharts b/qtcharts index a3259145..1c361fe9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a325914557d7a56d0ce3ad789a703fdb1c96d597 +Subproject commit 1c361fe93ea27706928047b8e4e4b2d9aea174fb diff --git a/qtconnectivity b/qtconnectivity index 00cc61aa..eda28d82 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 00cc61aa4e9d624dc4894afe819f7413a9204a68 +Subproject commit eda28d82e239c57533e73be622b26a3985fb86ce diff --git a/qtdatavis3d b/qtdatavis3d index 7d898954..c4c7a35e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7d898954aa9e3c75d44abae81dff563a8b4b003d +Subproject commit c4c7a35ea5d8faee7e315d26a2251ac02ffef103 diff --git a/qtdeclarative b/qtdeclarative index ad4960b4..cb37a1d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ad4960b40461c8b83599fe71540086182adecb10 +Subproject commit cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 042890a0..3d74af5e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 042890a01c19595a91268c536b81a94134b91807 +Subproject commit 3d74af5ee50fb949520f64923658a9b30b6bb5c8 diff --git a/qtlocation b/qtlocation index 0a8f8f40..31eada8e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a8f8f40c2fdfccc4bd1bf3c7411085ed634700e +Subproject commit 31eada8ecaabb1a969f315fe46d35971f61c6e83 diff --git a/qtmultimedia b/qtmultimedia index e99a2e17..89af8871 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e99a2e1701179d0d28ef1d1eac696d480894f4bb +Subproject commit 89af8871c653197d91541858013d08b8e7cbf751 diff --git a/qtpurchasing b/qtpurchasing index 0b3d10cd..0a627f67 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0b3d10cd5070a54dd71fbd067dcf6691c66c228a +Subproject commit 0a627f674d607a496703d1f33cb8cfe68a76ff2b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 108ba349..82b64b8b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 108ba34909a12d5d2d02a8a9cb738aaf65ac8868 +Subproject commit 82b64b8bec92212b90ee0987511179e14e1da071 diff --git a/qtremoteobjects b/qtremoteobjects index 8e79ec32..4f943eda 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8e79ec32f81aa65ac9ce1ad42ad1ee5452d42341 +Subproject commit 4f943eda910e3f7864cc0ca44113ae017fa5f92b diff --git a/qtscript b/qtscript index 5c7733d5..593ee850 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5c7733d5c5564a64468c5fdd5e8bd29cc131784c +Subproject commit 593ee850821dbe9eb7ff139eb2485d814694ca84 diff --git a/qtscxml b/qtscxml index 38f88ebf..b5daa31d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a447 +Subproject commit b5daa31da99fbe872b4df047f37da17ae2c119c9 diff --git a/qtsensors b/qtsensors index a436a733..bcc717b9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a436a733c3a07adb61f1ed9e2793fc47453ad2bb +Subproject commit bcc717b9ff5e9832794171217436029479b50f81 diff --git a/qtserialport b/qtserialport index 126809f1..fc7d7799 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 126809f150f03ab07b94bb508c89cea25440ac41 +Subproject commit fc7d7799b279d2c1fc2019966604f04e36218470 diff --git a/qtsvg b/qtsvg index f84b76cf..9fd48663 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f84b76cfe3f662684222f55981e34cee7a62ddff +Subproject commit 9fd486637caa7f3064561ad02f02241284a26f66 diff --git a/qttools b/qttools index 6b2f32f3..f3d047af 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6b2f32f3dc9de965801927a4bc5d970028a318a6 +Subproject commit f3d047af903801d9e7705816df5299c4e04a76f4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fac2615b..b550d020 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fac2615b2775e09a36901575898e0628606d2d06 +Subproject commit b550d02035516dfcb5a3739aa16efbca0e143922 diff --git a/qtwayland b/qtwayland index 671f73bb..3e9fe00c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62e +Subproject commit 3e9fe00c4e4ae4c096a960b4a3b432fca546007a diff --git a/qtwebchannel b/qtwebchannel index 43ef51f0..d87b0adb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 43ef51f08bdbd92c8e863fca3b3b8d8955603764 +Subproject commit d87b0adb32e7ed1d897670b59d7ebbb7c504c75c diff --git a/qtwebview b/qtwebview index a4a49a9a..8bfb710f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a4a49a9a8784f019358faf9bc76cd716b76609db +Subproject commit 8bfb710fcdddc0b2649f63588eea6eb389a54532 diff --git a/qtwinextras b/qtwinextras index 88277780..f5bc2b6e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 882777808d729ff1cdc129d555a739b065eedbae +Subproject commit f5bc2b6e6e4985ee113c595abdd1a4bd8b3472fa diff --git a/qtxmlpatterns b/qtxmlpatterns index ee64d3cb..5c6aaf18 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ee64d3cb160347fe19a86b47f3b26b78b20502bf +Subproject commit 5c6aaf182f2fa4860f9bdabcc31970769198a814 -- cgit v1.2.3 From 8ede8851f4ba936b0ef7d163fc9183bf8d3491b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Aug 2019 09:04:53 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlottie | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qttools | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 64e10caa..e1f988f4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 64e10caaa1c261167fd98f91ce87cbefd11782ca +Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b diff --git a/qtbase b/qtbase index 4f116f00..48b3ec6e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 +Subproject commit 48b3ec6e8e4be23e0d4620fb32b8c7faf082569d diff --git a/qtdeclarative b/qtdeclarative index aeec2f94..ffda7180 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aeec2f94c376c9a0e84bbbb3be4652384c7da113 +Subproject commit ffda7180f3c11c35699ba8aa1a16efc6ee962e02 diff --git a/qtdoc b/qtdoc index 2b710e89..6430e145 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2b710e89fa7a1ce71bd98185580d9498af652a6e +Subproject commit 6430e145e2d905d11daf690d2021ba1379780bbe diff --git a/qtlottie b/qtlottie index 4c3207a7..86c7306e 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4c3207a7385a3ba402884bb50136bbe7b70baa2e +Subproject commit 86c7306ebc0d011a096f0554e0c206fe17bb577c diff --git a/qtqa b/qtqa index da16b930..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtremoteobjects b/qtremoteobjects index ff2c16f4..c54e2f33 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 +Subproject commit c54e2f336e94ac261e26bd56495210ee22b88dee diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qttools b/qttools index b05d6b04..f7fc0f1c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b05d6b04e0527953983cc0451015efa27fa58580 +Subproject commit f7fc0f1cf38b2d9dbacc52642d68af66882e2026 -- cgit v1.2.3 From f46f85b0c7a3f6a860569d5c2b36031c1cfe494f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 9 Aug 2019 16:22:35 +0200 Subject: Update qt5 wip/qt6 Point qtbase to latest wip/qt6. Temporarily disable building qt3d because it fails with the new qtbase version, but updating it with old SHA1 of qtbase is also not possible. Change-Id: I232920be48f01608f196c24370c684eccbd3994f Reviewed-by: Simon Hausmann --- .gitmodules | 2 +- qtbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfd15d9a..9220ee7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = wip/qt6 - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qtbase b/qtbase index f44850b5..6132260d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 +Subproject commit 6132260da394a9627947f0fe6a279c20863b6ad2 -- cgit v1.2.3 From edf6149a5b7756a60ecbaa623aa700a2b91d1a6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Aug 2019 22:31:00 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwayland | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 48b3ec6e..d502b19b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 48b3ec6e8e4be23e0d4620fb32b8c7faf082569d +Subproject commit d502b19b283806d2ef5c6b7bfd79baef15f3845c diff --git a/qtwayland b/qtwayland index f4636b93..6f44ad0f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f4636b934f90b2a07b09f1925a86440cf1944d08 +Subproject commit 6f44ad0f42bd93e60979501a5740dab92661b29c -- cgit v1.2.3 From 621c18b60b640572ffbad57e7f669e048ac63bb4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 11 Aug 2019 10:15:26 +0200 Subject: Update qt5 wip/qt6 Point qt3d, qtdeclarative, qtgraphicaleffects, qtimageformats, qtnetworkauth, qtquickcontrols2, qtsvg to latest wip/qt6. Also re-enable the qt3d build. Change-Id: If9d122e064021b500a423376b991edbb5c1903fc Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- .gitmodules | 2 +- qt3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9220ee7a..cfd15d9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ path = qt3d url = ../qt3d.git branch = wip/qt6 - status = ignore + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qt3d b/qt3d index 1b448781..336e0eb1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1b4487817e68a5e87eff54793b02c85792accc10 +Subproject commit 336e0eb1bc21215012f56f725ebbfb5710d22814 diff --git a/qtdeclarative b/qtdeclarative index cb37a1d0..9e32b23a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b +Subproject commit 9e32b23a1514f367921b4a9ee25bc864a008463c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3d74af5e..433dd81e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3d74af5ee50fb949520f64923658a9b30b6bb5c8 +Subproject commit 433dd81e28ea86f2790a6eadccb73609feaa4754 diff --git a/qtimageformats b/qtimageformats index 27620737..657f6d3c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2762073738d0343b2ba6e38624de2040c34bc393 +Subproject commit 657f6d3c125d852c25c1233f473782eb81e03ab9 diff --git a/qtnetworkauth b/qtnetworkauth index c82ade62..4655361d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8c +Subproject commit 4655361d2fe804d725646a2a45e0a1bc7a44c1d1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 82b64b8b..341ace84 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 82b64b8bec92212b90ee0987511179e14e1da071 +Subproject commit 341ace84485ffb3c2f05818e1b95604849217c9a diff --git a/qtsvg b/qtsvg index 9fd48663..24a7b418 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9fd486637caa7f3064561ad02f02241284a26f66 +Subproject commit 24a7b41822333f33c2ec5027795e265a5ad0d350 -- cgit v1.2.3 From 19cc6b2b80f7c5275b31ce285aad5ad9207b474e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Aug 2019 10:39:24 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312 Reviewed-by: Liang Qi --- qtlocation | 2 +- qtmultimedia | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtlocation b/qtlocation index 46ae4e4d..8a08b56e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 46ae4e4db687b8a12e639d9b248546652b680c04 +Subproject commit 8a08b56e71ff3d842cbfb6460a18d5ff991689db diff --git a/qtmultimedia b/qtmultimedia index 2da4e162..a5ddec65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 +Subproject commit a5ddec658526e47e5783a89c1fd1c463d464fbe7 diff --git a/qtsvg b/qtsvg index 1bdd9b7b..fe7d2028 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 +Subproject commit fe7d20286e50c5ac08fb153436580d985d7530ea diff --git a/qtwebengine b/qtwebengine index fa555f40..a6c32599 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fa555f40bca60e82194bef22915bf7c545082c0e +Subproject commit a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c -- cgit v1.2.3 From d19f60d7458a295c4abf36aef1332184c7de41bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 7 Aug 2019 15:09:30 +0300 Subject: Provisioning: Append the emscripten to path instead of prepend Having it first in path seems to cause some confusion when detecting libc++ in darwin. Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/emsdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 17af067c..acb2483a 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -89,7 +89,7 @@ COMPILER_ENGINE = NODE_JS JS_ENGINES = [NODE_JS] EOM -SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version:\$PATH\"" +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" -- cgit v1.2.3 From c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Aug 2019 13:44:07 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I912e43550293e17b22e1401d50e7a4a06ee4c3b3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 9fab345f..87abbae2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9fab345f26ddf8574cdf3c967609c01ff00d512c +Subproject commit 87abbae2f16bae53aff6b2e41658bafbef642a95 diff --git a/qtbase b/qtbase index c595878a..50e496bd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c595878aa34c5861b00f0c59bc4b0b6c02a54543 +Subproject commit 50e496bd3ac71ccebc99c0a429b41fb0e7864ac2 diff --git a/qtdeclarative b/qtdeclarative index d1b72c98..d4e1f539 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d1b72c98b4e617530bfb23c3a5b7ebc68c15c089 +Subproject commit d4e1f5395c896dc5bda9a2e122e2ed0f45be6c18 diff --git a/qtlocation b/qtlocation index 0a242cc0..3334c6f6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a242cc026190432a115a82752ddf35b8be15de6 +Subproject commit 3334c6f6d00255f6fd5690e4b9cb05416950fd4d diff --git a/qttools b/qttools index 83086517..eba0529d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8308651784dc591e1d07126bdff6e7a606ec618b +Subproject commit eba0529d488536e83b1e32b1c1c6c1000790e329 diff --git a/qtwebengine b/qtwebengine index f383f899..23b24fb4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f383f899cba71c02f2fcacd7f54b17a50f8e33d0 +Subproject commit 23b24fb49a9115151ea086afd271fdf9bb36fda0 -- cgit v1.2.3 From 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 11 Aug 2019 14:33:17 +0200 Subject: Update qt5 wip/qt6 Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to be built. Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873 Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qtwebengine | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfd15d9a..9396d189 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = wip/qt6 - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,7 +230,7 @@ path = qtwebview url = ../qtwebview.git branch = wip/qt6 - status = ignore + status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats diff --git a/qtwebengine b/qtwebengine index 83fa1d5f..d91b839d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 83fa1d5f9b890ba251f7dc8f82acd950e9527343 +Subproject commit d91b839d67bcfa1cfeb3d095b6885c97c53b9812 -- cgit v1.2.3 From 42366fd7405f778d3b80f9de2f593ff18f52e0f9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 14:11:15 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index e1f988f4..b669a0d1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b +Subproject commit b669a0d133b027091117ecccd9e47aa8086ef4ff diff --git a/qtbase b/qtbase index d502b19b..b5677bc6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d502b19b283806d2ef5c6b7bfd79baef15f3845c +Subproject commit b5677bc6da9c5e7517edc4902dc1fe7cf211685d diff --git a/qtconnectivity b/qtconnectivity index 96dd4e7f..e4138bd7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 96dd4e7ff0b10ac79798f1ae63db716bcc199e87 +Subproject commit e4138bd7b2b6ab6c544ad5ab49cf2c193c7cd9a2 diff --git a/qtlocation b/qtlocation index 46ae4e4d..a13506d5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 46ae4e4db687b8a12e639d9b248546652b680c04 +Subproject commit a13506d54409a78ee13a84052b78050a2f686832 diff --git a/qtmultimedia b/qtmultimedia index 2da4e162..7b1bb300 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 +Subproject commit 7b1bb300166aa19dc0f4c6838eb6d284af73236c diff --git a/qtremoteobjects b/qtremoteobjects index c54e2f33..eff13458 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c54e2f336e94ac261e26bd56495210ee22b88dee +Subproject commit eff13458a10ab9c40a839f952dedbfce2e6df59a diff --git a/qtscript b/qtscript index 91234654..590a5ffc 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 912346548c774cdcc4383cc30e06f106dbf77a97 +Subproject commit 590a5ffcb76157f4278e2778135d8d17bc815295 diff --git a/qtsensors b/qtsensors index 6390e165..47d1ff28 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6390e165dc2df3bc48c3655ed45d1b952d1f2bae +Subproject commit 47d1ff2813575981d02434d6cffd6384687f832b diff --git a/qtserialbus b/qtserialbus index 5d82bf36..7e8ad7f0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5d82bf36c526d55951127c95d8c0aa5abc2e199d +Subproject commit 7e8ad7f0bb43a3235fbf8e099e853ec3e2ce8a25 diff --git a/qtsvg b/qtsvg index 1bdd9b7b..fc2bc2db 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 +Subproject commit fc2bc2db0ed8887253a2e0a41634e7d22af00283 diff --git a/qttools b/qttools index f7fc0f1c..6690a845 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f7fc0f1cf38b2d9dbacc52642d68af66882e2026 +Subproject commit 6690a8453989408401d8166f1ab3aa41cc2d4360 diff --git a/qtwayland b/qtwayland index 6f44ad0f..ca9be5ca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6f44ad0f42bd93e60979501a5740dab92661b29c +Subproject commit ca9be5cab503d85831653d6c4bc9c59bd0f6ad57 diff --git a/qtwebchannel b/qtwebchannel index c5d4f9b1..018b2740 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c5d4f9b1a653a242b6231cbdea8ccfc751180beb +Subproject commit 018b2740f793e1f4142d95736ff0554aa4e0a71d diff --git a/qtwebengine b/qtwebengine index 50dc091b..b1bdb599 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 50dc091b5ddca2fb1c80e398d2ab360a5ec5e767 +Subproject commit b1bdb599a397d3f8d068b8619d32061c20e13e7c diff --git a/qtx11extras b/qtx11extras index d6090610..9f325067 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d6090610969cd7f2f5554e6239b0e35f8755196a +Subproject commit 9f325067de14ffbed42775c2a3d1f9570bf696ae -- cgit v1.2.3 From 9dd445123465dde1089d2c0285add1db225ccec3 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 20 Aug 2019 11:07:46 +0300 Subject: Android: Update Android NDK to version r20 Fixes: QTQAINFRA-3152 Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5 Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qt5.yaml | 14 +++++++------- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- coin/provisioning/common/windows/android.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 8de9e023..18ea85f3 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -113,7 +113,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' @@ -121,7 +121,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index b72ab7c2..c164eb44 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -41,7 +41,7 @@ Compiler: 'GCC' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch x86' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -49,7 +49,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch armeabi-v7a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -57,7 +57,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch arm64-v8a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -65,7 +65,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -73,7 +73,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -81,7 +81,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -89,7 +89,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..1e151efe 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" +ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..fb5c5aab 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -51,7 +51,7 @@ $sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" $destination = "C:\Utils\openssl-android-master" # msys unix style paths -$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$ndkPath = "/c/Utils/Android/android-ndk-r20" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index def09116..537e14a2 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r19c" +$ndkVersion = "r20" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" -$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" +$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version -- cgit v1.2.3 From 5f8a9b15ded9e1c32cf98275c32231e670b6b4f0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Aug 2019 15:24:27 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt3d b/qt3d index 87abbae2..9517e406 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 87abbae2f16bae53aff6b2e41658bafbef642a95 +Subproject commit 9517e406e64ae0d28e83c49334d8e7dc854516ef diff --git a/qtactiveqt b/qtactiveqt index 89e2d977..e9f78ada 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 89e2d977323e874b4074aa1b969a4be5141184b8 +Subproject commit e9f78adad0205ff539a35587be86c8e7a0bfd5bd diff --git a/qtandroidextras b/qtandroidextras index 503ba3db..e3771f91 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 503ba3db8749b49ed2e4705fd353c897dae390a5 +Subproject commit e3771f91b466e356276e703d1a02bfe11f93a29a diff --git a/qtbase b/qtbase index 50e496bd..a4d19654 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50e496bd3ac71ccebc99c0a429b41fb0e7864ac2 +Subproject commit a4d19654edec88b5ca0a2516c1b2038ad309ca6d diff --git a/qtconnectivity b/qtconnectivity index ccc1544f..a309d04f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ccc1544f5ff929f466df8c790a4e7595e177a720 +Subproject commit a309d04fa1edb3fa320d420758b3967616ad792a diff --git a/qtdeclarative b/qtdeclarative index d4e1f539..c400b776 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d4e1f5395c896dc5bda9a2e122e2ed0f45be6c18 +Subproject commit c400b7765ff5204edf9243387f1928a770985382 diff --git a/qtdoc b/qtdoc index c7a53256..68f41f4c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7a53256d262ba58e59ebc3863c21c7b6cd2f0c8 +Subproject commit 68f41f4c35e3a400bd48ab6a9e544d3fd8544062 diff --git a/qtimageformats b/qtimageformats index 82a6d342..5214bcd3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 82a6d3426215253e013dd3ddd6712488388bc926 +Subproject commit 5214bcd3d868664bb057f2689c02ec263bbc980b diff --git a/qtlocation b/qtlocation index 3334c6f6..5ba1ffc3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3334c6f6d00255f6fd5690e4b9cb05416950fd4d +Subproject commit 5ba1ffc31227e652f98eb27c47e20a42f197f6b6 diff --git a/qtmultimedia b/qtmultimedia index 9178132f..8972b268 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9178132f75563cd0e907525f08736c1b4cec73b4 +Subproject commit 8972b26890b9c4d7e82cc47a4864fda0a8a78ff4 diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qtremoteobjects b/qtremoteobjects index d88c6a16..97d48160 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d88c6a1690d1d725e4436537546b3d5681ee4a9f +Subproject commit 97d481601c63f5e36ecd7cde883b79011ead154a diff --git a/qtscript b/qtscript index 40b5d325..44a9b1ff 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 40b5d325b6105d4e520c76a079f530168b58efec +Subproject commit 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474faf diff --git a/qtsensors b/qtsensors index 4dfa9553..f8f2c4a5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4dfa95538ff15f59880c93675676ce609b365d89 +Subproject commit f8f2c4a5d0640090fd50656b1b585c0c3a0936bb diff --git a/qtserialbus b/qtserialbus index 556c6b67..45f9593e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 556c6b67315c25f7e4359ab19314f3485f10ecc6 +Subproject commit 45f9593eff1141e7a86cda4f3dd2380c237c9f54 diff --git a/qtsvg b/qtsvg index b80a1676..9d274388 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b80a1676c9f5cc0b428f15ac09f6648a80aacb26 +Subproject commit 9d274388f620dfafe0bc8fe0855ce0c8e8ae7892 diff --git a/qttools b/qttools index eba0529d..3d544cbc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eba0529d488536e83b1e32b1c1c6c1000790e329 +Subproject commit 3d544cbc55253dd35b3c7ccfd223b56de140aa84 diff --git a/qtwayland b/qtwayland index 52b65607..622b55e9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 52b6560708ebcfeeaebdf2b43f368c610aa905a4 +Subproject commit 622b55e918bfc877c10f8885754b30b593d334a5 diff --git a/qtwebengine b/qtwebengine index 23b24fb4..ee7ac44d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 23b24fb49a9115151ea086afd271fdf9bb36fda0 +Subproject commit ee7ac44d4c8903ac7c169d82999474365e361f91 diff --git a/qtx11extras b/qtx11extras index 15ffa33a..a0443bd7 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 15ffa33a162325d2d16437a057e79cd3b0e3d61c +Subproject commit a0443bd723601205c8cc4666dd89be5a32decf98 -- cgit v1.2.3 From ff75bd52975918eef5711826356143e9e8a90180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 19 Aug 2019 15:10:15 +0200 Subject: Add QtQuick3D as a submodule in qt5.git Adds QtQuick3D as a preview module in dev Task-number: QTBUG-77724 Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a Reviewed-by: Andy Nichols --- .gitmodules | 6 ++++++ qtquick3d | 1 + 2 files changed, 7 insertions(+) create mode 160000 qtquick3d diff --git a/.gitmodules b/.gitmodules index b3c46af7..ef01576e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -318,3 +318,9 @@ url = ../qtquicktimeline branch = dev status = preview +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = dev + status = preview diff --git a/qtquick3d b/qtquick3d new file mode 160000 index 00000000..03dbcc5e --- /dev/null +++ b/qtquick3d @@ -0,0 +1 @@ +Subproject commit 03dbcc5eb3364886ee8ffc07b4438eaee3c188fe -- cgit v1.2.3 From 8f87412708069200557509f5cd513291b8afc225 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Sun, 25 Aug 2019 22:48:32 +0200 Subject: platform_configs: replace -qt-xcb with -xcb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... as we are removing -qt-xcb switch from qtbase as part of stopping to bundle xcb sources. Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6 Reviewed-by: Simo Fält --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 18ea85f3..63ce11b3 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -70,7 +70,7 @@ Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' -- cgit v1.2.3 From 1eae3c41854294216e600f3f4a7dfc3987d30d0b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 7 Sep 2019 09:03:51 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d 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 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 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 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/qt3d b/qt3d index 9517e406..67f7a83d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9517e406e64ae0d28e83c49334d8e7dc854516ef +Subproject commit 67f7a83d935539e185b4bf26e7c1c79e254497a8 diff --git a/qtactiveqt b/qtactiveqt index e9f78ada..855c0160 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e9f78adad0205ff539a35587be86c8e7a0bfd5bd +Subproject commit 855c01603e19a78cb73421d4a5c2410c4ad31c3e diff --git a/qtandroidextras b/qtandroidextras index e3771f91..9ee2af54 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit e3771f91b466e356276e703d1a02bfe11f93a29a +Subproject commit 9ee2af5485f02cbd4cd88cc02ab147f830007a71 diff --git a/qtbase b/qtbase index a4d19654..bf8fcab8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a4d19654edec88b5ca0a2516c1b2038ad309ca6d +Subproject commit bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 diff --git a/qtcharts b/qtcharts index ff84fb0f..a5d54eb0 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd3 +Subproject commit a5d54eb0efd0155174e6b69bb6c4c069d20e99fe diff --git a/qtconnectivity b/qtconnectivity index a309d04f..75bb24bf 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a309d04fa1edb3fa320d420758b3967616ad792a +Subproject commit 75bb24bf9efc771d8462a3ee69ace6b398f8515f diff --git a/qtdatavis3d b/qtdatavis3d index 422856bb..a54a5a25 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 422856bb470e1380309c66a8ba4b40e06d1df830 +Subproject commit a54a5a253fce25d0ffa215996a3cdf2fca8b06bc diff --git a/qtdeclarative b/qtdeclarative index c400b776..bdf0a46c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c400b7765ff5204edf9243387f1928a770985382 +Subproject commit bdf0a46c289298f7378796d62ae5fb283e08657d diff --git a/qtdoc b/qtdoc index 68f41f4c..c3a3c01c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 68f41f4c35e3a400bd48ab6a9e544d3fd8544062 +Subproject commit c3a3c01c7f4df8cbdcf328cfb76f530c90f4281a diff --git a/qtgamepad b/qtgamepad index ea0457b8..301af009 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ea0457b8058191b4bb22477c7b51975a70af0b0e +Subproject commit 301af00942b710d8157a916907e2c8324f2502c5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c76eb211..446eb21f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c76eb211ff12fc3a1588c3092dd76a41eb5551c7 +Subproject commit 446eb21ff4a6787169c9ef4f9e9ebd531ce58c7a diff --git a/qtimageformats b/qtimageformats index 5214bcd3..e6ab94c6 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5214bcd3d868664bb057f2689c02ec263bbc980b +Subproject commit e6ab94c607d8bc078e3d6ba776aa2b69a1448466 diff --git a/qtlocation b/qtlocation index 5ba1ffc3..2b743cdc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5ba1ffc31227e652f98eb27c47e20a42f197f6b6 +Subproject commit 2b743cdca353f84959dac47e4ca24615c6f1830a diff --git a/qtlottie b/qtlottie index 03b666a9..5891e5d7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 03b666a967fb7501248e9f40a5b187ec3a16c453 +Subproject commit 5891e5d7f5b1134a184fb82926c10866257f1f61 diff --git a/qtmacextras b/qtmacextras index af348830..d1c4e8d6 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit af348830a3ae6852a4e7ff612c045e11c094ef5f +Subproject commit d1c4e8d6e4dd6200e9c3371e43b63e18911a9cca diff --git a/qtmultimedia b/qtmultimedia index 8972b268..18e6110d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8972b26890b9c4d7e82cc47a4864fda0a8a78ff4 +Subproject commit 18e6110dfdfd62cc0032f8e43586d075f15299f0 diff --git a/qtnetworkauth b/qtnetworkauth index 272ea7f5..2b5e2bf7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 272ea7f508d8ee30311c08c07c6e0501f17338c2 +Subproject commit 2b5e2bf759946d3c3f3eddafc4092338b05923ae diff --git a/qtpurchasing b/qtpurchasing index bc6d5686..689db879 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit bc6d56861b93bd87958baa3384c3cbd895f1c3f9 +Subproject commit 689db87975134dc7332cf32ce2afe96d8a5211a8 diff --git a/qtqa b/qtqa index 68a9cf7c..3cbc0456 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb diff --git a/qtquick3d b/qtquick3d index 03dbcc5e..ef675a99 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 03dbcc5eb3364886ee8ffc07b4438eaee3c188fe +Subproject commit ef675a99da6f729e36d0d2f1802de3b857db3627 diff --git a/qtquickcontrols b/qtquickcontrols index 6ab10d97..61463e78 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6ab10d971d7d98eeaa50203c24d53da35cfe2187 +Subproject commit 61463e781f1892f11a45f9c924aa9b5dbbb359fc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 92c827a2..72149cbb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 92c827a2a4b7e56dcb6865fa35fba25b5d2eb87f +Subproject commit 72149cbb6fe7b1e6af4018c945ece738f8ad0a10 diff --git a/qtquicktimeline b/qtquicktimeline index 6e6d4927..5651ee82 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f +Subproject commit 5651ee826fa129f5d893ee280d83c1cf2aa7eb2f diff --git a/qtremoteobjects b/qtremoteobjects index 97d48160..a23672ba 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 97d481601c63f5e36ecd7cde883b79011ead154a +Subproject commit a23672bad7e28cc0b9c573ad6909e15a46390657 diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qtscript b/qtscript index 44a9b1ff..19a50261 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474faf +Subproject commit 19a5026113c88ed1be83ed7c18f56c19daeea8da diff --git a/qtscxml b/qtscxml index 279d63c4..1b555247 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 279d63c4f6632237e6a0d9c4be91b466876c260a +Subproject commit 1b555247e953d9be2b442f281698df475ad9fffb diff --git a/qtsensors b/qtsensors index f8f2c4a5..3935d259 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f8f2c4a5d0640090fd50656b1b585c0c3a0936bb +Subproject commit 3935d25914a98615ef1e857efb568da1c6db1ef7 diff --git a/qtserialbus b/qtserialbus index 45f9593e..d59e2a4b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 45f9593eff1141e7a86cda4f3dd2380c237c9f54 +Subproject commit d59e2a4b72154b64e1d26fd1068933b8a25da77b diff --git a/qtserialport b/qtserialport index bc4196f9..cb8cf3e7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bc4196f908a96522ecaab078141364b3e10d1788 +Subproject commit cb8cf3e7fd7a4ea39c25057c59888112e342ee66 diff --git a/qtspeech b/qtspeech index c1860e04..bcca555e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c1860e04dfcf9eddcf14cbc4e44f441ad75ffc83 +Subproject commit bcca555e7227a0e651dd27dcb61bb5ae0f0b9c6c diff --git a/qtsvg b/qtsvg index 9d274388..7831afe0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9d274388f620dfafe0bc8fe0855ce0c8e8ae7892 +Subproject commit 7831afe0d496794cdc7a7ffbf1b374120941c3ea diff --git a/qttools b/qttools index 3d544cbc..cbb56d8d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3d544cbc55253dd35b3c7ccfd223b56de140aa84 +Subproject commit cbb56d8dab2447ce8fda454e6c6cd6938dffacb1 diff --git a/qttranslations b/qttranslations index 66952c79..ab5af4c6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 66952c79bc648e1074936dddb7fa2cffc17b1777 +Subproject commit ab5af4c676b80a69e0f1b8459d4c081a43f63313 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e342f136..92404f74 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e342f1366eff06f3cf01991b377c880b2d246177 +Subproject commit 92404f740116f29866e9f91505d94a2be6dd23ee diff --git a/qtwayland b/qtwayland index 622b55e9..fb1f6733 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 622b55e918bfc877c10f8885754b30b593d334a5 +Subproject commit fb1f6733b6d98d84f8abd89623c3878ed4a62573 diff --git a/qtwebchannel b/qtwebchannel index 29496e3f..869a1a5f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 29496e3f08e20398e253e6d32bb95879a1a68978 +Subproject commit 869a1a5f7321dcd3fdd57735fb503a6d3506c616 diff --git a/qtwebengine b/qtwebengine index ee7ac44d..7268797a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ee7ac44d4c8903ac7c169d82999474365e361f91 +Subproject commit 7268797ab9e32de7497f13ffa9820c49d8cb3e47 diff --git a/qtwebglplugin b/qtwebglplugin index e51341cf..5f7bd725 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e51341cf20447c42a62281e633513837058f62e5 +Subproject commit 5f7bd72592576bb193592702a26a8b0288642a58 diff --git a/qtwebsockets b/qtwebsockets index e108b1f0..4f29e93b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e108b1f06d18003d7a758b07bc3bea9922b2e116 +Subproject commit 4f29e93b157ed6e4e264297d27a8e1c006e098a1 diff --git a/qtwebview b/qtwebview index fb2a2003..64f98997 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fb2a2003fbb41ac91b319afb56f290b415befb64 +Subproject commit 64f9899781446d73e6ccc42021d4efbd8d1feb85 diff --git a/qtwinextras b/qtwinextras index ee2d2f7a..23fb8fa7 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ee2d2f7a93c5b0866e91293d6233ae2703281ca6 +Subproject commit 23fb8fa7d3894d5f93ec5d51461e1366274a0c0b diff --git a/qtx11extras b/qtx11extras index a0443bd7..82d4d38d 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a0443bd723601205c8cc4666dd89be5a32decf98 +Subproject commit 82d4d38d2037ae36b38fe81916b14feb4068972b diff --git a/qtxmlpatterns b/qtxmlpatterns index 9da08816..31015147 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9da08816e1072fc1391377a38d6afd9e73d756e0 +Subproject commit 3101514787f7f3a451514b2ef3fc6e7bcfe1f0ce -- cgit v1.2.3 From b2febbfbc7ec46f53b58bb6118571020d444315c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Sep 2019 13:35:29 +0200 Subject: Update submodules on 'wip/qt6' in qt5 Only qtmultimedia and qtwebengine in this round. Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564 Reviewed-by: Simon Hausmann --- qtmultimedia | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 89af8871..64ddd6a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 89af8871c653197d91541858013d08b8e7cbf751 +Subproject commit 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f2 diff --git a/qtwebengine b/qtwebengine index d91b839d..2f71cdff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d91b839d67bcfa1cfeb3d095b6885c97c53b9812 +Subproject commit 2f71cdff2cda7903fd0b5ff0033d790877e40181 -- cgit v1.2.3