From 8a4f808649d7733ab3a6f25da8d73f6e671760a6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 15 Nov 2019 15:25:41 +0100 Subject: Set qtgraphicaleffects essential as qtquickcontrols2 depends on it Change-Id: I0a157f71ed8d5132b8238691cbb0f4aa57b04976 Reviewed-by: Mitch Curtis --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f6948954..5782a1e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -150,7 +150,7 @@ path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.14 - status = addon + status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects -- cgit v1.2.3 From 3c0578e0bf08bddf7b809498dc20d60cda7c8ff8 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Fri, 28 Feb 2020 09:17:28 +0200 Subject: Adjust submodule branches --- .gitmodules | 84 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5782a1e9..b1c6eba5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.14 + branch = 5.14.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.14 + branch = 5.14.2 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.14 + branch = 5.14.2 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.14 + branch = 5.14.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.14 + branch = 5.14.2 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.14 + branch = 5.14.2 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.14 + branch = 5.14.2 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.14 + branch = 5.14.2 status = preview [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.14 + branch = 5.14.2 status = preview [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.14 + branch = 5.14.2 status = preview -- cgit v1.2.3 From 9e97db2714ac310afbbbec3f9addebfe7255248a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 28 Feb 2020 15:48:46 +0200 Subject: Add missing -qt-zlib configuration parameters for MSVC2019 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic0b6842b879ecc2951ae5aab3380c5d6e8343f97 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index a156ecee..ea57fb93 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -15,7 +15,7 @@ Configurations: Target arch: 'x86' Compiler: 'MSVC2019' 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%' + 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% -qt-zlib' - Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' @@ -39,7 +39,7 @@ Configurations: Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2019' 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%' + 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% -qt-zlib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From fd23ab598e7de7b889d70b48937f91c38a1db755 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Mar 2020 22:30:53 +0100 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I0800d3bc95f5010ce0045f6fa1115288a3009bee Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 875420f1..4a1de178 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 875420f1c29f0d5e66b4dcacbe95d31dd5dca585 +Subproject commit 4a1de178c9cc891560f38d64d89074799b0fa0e1 diff --git a/qtconnectivity b/qtconnectivity index a2769b32..0282c2fc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a2769b323dc890def9dffaf98c768cec12eba3c0 +Subproject commit 0282c2fc4ae437cb4f549f25f3e748a90e64f864 diff --git a/qtdeclarative b/qtdeclarative index dd481a2b..83fdcbf3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dd481a2bb4f858178b984a38cd8c3621d46446b7 +Subproject commit 83fdcbf3be0ddbbee1fd2c8c9ff1a4e3c707e3f0 diff --git a/qtdoc b/qtdoc index bc37d41c..e97e5fc3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bc37d41cd8606603fbdf5cc8790f003b27ee5117 +Subproject commit e97e5fc31e55683e93f5a76638c229d6c9d42b0a diff --git a/qtimageformats b/qtimageformats index 9584748f..0c4d4dc1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9584748fc6847240fd6b748e6735e91e451b8958 +Subproject commit 0c4d4dc12a68124451113e21d2c4fdc5d06d01d0 diff --git a/qtlocation b/qtlocation index 1fb878d8..07de1d0f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1fb878d8de41a2cfd2e0afe4c939679bbb65fdb2 +Subproject commit 07de1d0f0f93b742434e2fcfda70bf70cb6373c9 diff --git a/qtqa b/qtqa index 4098117a..dc43cb91 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4098117a402db2503a5a0475241ccf93965c686d +Subproject commit dc43cb91261083f85d8fdea8068bf91fa5621351 diff --git a/qtquick3d b/qtquick3d index 82e8864f..2c425cf3 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 82e8864f497af2b2a54d8308c793ebd1ecfc3be4 +Subproject commit 2c425cf308188a0b3fc3f288ee71934a4ed4da40 diff --git a/qtremoteobjects b/qtremoteobjects index 9129bbda..14daacff 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9129bbda7b90469e710772cec60f6d6b5e878278 +Subproject commit 14daacff9654980381a1d0b7b09d0b25f6c9dbb2 diff --git a/qtrepotools b/qtrepotools index 4370cfe2..7fc65858 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4370cfe245a402e41c8c33ddac5014dfa6b226c0 +Subproject commit 7fc65858bf56ba4533ab3ef391adb63334d9dd98 diff --git a/qtserialbus b/qtserialbus index ab6f188b..b6387715 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ab6f188bf00a9572804baa7b788536247ce88626 +Subproject commit b63877157c2c9681ced1efbfefe1d2d1debf812e diff --git a/qtsvg b/qtsvg index d072a505..45530ad4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d072a505d7ff39d509b9c9e2de8722cd3549b4df +Subproject commit 45530ad4c5c6d3e90fe6d5a63f3bb551f37ad917 diff --git a/qttools b/qttools index 698ffa21..ce895f06 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 698ffa215fd3fd7b8dd67ed9be88ca1a6731df91 +Subproject commit ce895f066579f71d87c3b46361e291ad7734e88e diff --git a/qtwebengine b/qtwebengine index 97bfaef8..19444168 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 97bfaef8a39419d9524ef6ebbd073e5aee9c9c7d +Subproject commit 19444168395424fef4daff76ce64b9813aef0610 diff --git a/qtwebsockets b/qtwebsockets index 2d10eaba..9d3eb184 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2d10eaba1607f3efaaf3020e4b7c57a31060177e +Subproject commit 9d3eb184c72333a95ee8f9ee33bd51942271de64 -- cgit v1.2.3 From b601579ddaa02a552deeca4ef117c05b9cd31b4d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Mar 2020 23:46:26 +0100 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I14c3b2f4040378851ed9f7995c57ddf77948aa94 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index aa7c8a5c..2f8c7dd6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit aa7c8a5cb1111d46289e6b370dcd5b1d3f66c80d +Subproject commit 2f8c7dd69c9d234b03ea0262e5246ceaaaa444db diff --git a/qtbase b/qtbase index 291b3ceb..8f8eb999 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 291b3cebb905c3924eefa1e5a7c6ac31ca89aacd +Subproject commit 8f8eb99991216c0833c23a0f068e036a70e3b060 diff --git a/qtcharts b/qtcharts index 41bdefce..c8e3bf29 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 41bdefce20be3ebbeebaba215402211664a29c79 +Subproject commit c8e3bf290551328851cf628ce4a488a06b013ac2 diff --git a/qtconnectivity b/qtconnectivity index 79702f74..531443d1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 79702f744e4906155736967dea1af5433355c71a +Subproject commit 531443d1f00c0ebc6a56ebc30e5eea85b318b73e diff --git a/qtdatavis3d b/qtdatavis3d index 9ba8b807..407bee91 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9ba8b807d002e0b93afe5e08221cf6c38b0055fb +Subproject commit 407bee91eb83b6ff2df6e5d99366971bf21e2637 diff --git a/qtdeclarative b/qtdeclarative index b3ff342d..6381f6c8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b3ff342d327dc00d99281dca4fbfe6c4300aa6c6 +Subproject commit 6381f6c87ff3eb3e15ba62f58a5393ce9026b99f diff --git a/qtdoc b/qtdoc index a47e72bd..1c236912 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a47e72bd0d8841e95eb54e5bb2745263dc347b67 +Subproject commit 1c2369121e1c2a3b81c14ddb1fdd38061289abae diff --git a/qtgamepad b/qtgamepad index 3c91ce46..19671371 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 3c91ce46a69449a0350b63a17c79cd69090ffcc0 +Subproject commit 196713714a63e789b65822e2222208251857359b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 20f436e0..617bb58e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 20f436e045bc4636af6acecfa11478f926d4be42 +Subproject commit 617bb58eb0b381ae6095fe8947bc7f9e25ef85b1 diff --git a/qtimageformats b/qtimageformats index d89c6be6..5a1a12b0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d89c6be6f28182111cabe9547d10e31d8a7cd05f +Subproject commit 5a1a12b0e135eb49f7b232c729859583b76bd507 diff --git a/qtlocation b/qtlocation index 47391b2d..0a074c71 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 47391b2d74f65ea3a3a67c0a5359499582d6cfdb +Subproject commit 0a074c7164f562417b2667c175d4e20d63415b48 diff --git a/qtmultimedia b/qtmultimedia index 70f5eb4f..19477de8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 70f5eb4f707ce84cbf153899d33d6bd8656be682 +Subproject commit 19477de84a64f412bca9ce2df62ab9adb3859da2 diff --git a/qtnetworkauth b/qtnetworkauth index 3e3f047e..1afc9939 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3e3f047e59db88e806b3c1fd94c4a996f5317b68 +Subproject commit 1afc99397bd35fc3cd24913f5dc10743de1833dc diff --git a/qtpurchasing b/qtpurchasing index 3ef91292..0fd1c541 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 3ef91292426c4aa56989e843e1c675a7ba6ac1c9 +Subproject commit 0fd1c5413bd433755e54c7d69493efc45c432764 diff --git a/qtqa b/qtqa index 4098117a..25a39da9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4098117a402db2503a5a0475241ccf93965c686d +Subproject commit 25a39da9b7bacebc29ee5ffa688fa4953a6ab3dd diff --git a/qtquick3d b/qtquick3d index 0cb94434..e3aa1c6a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0cb944343f032bc6fca94fd4375dce422217d329 +Subproject commit e3aa1c6a7c12c4c38ba28d0ae6ba91adfe3b07c7 diff --git a/qtquickcontrols b/qtquickcontrols index 7a806347..d286adc5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7a806347167607172ee38c60d30808b298224a8b +Subproject commit d286adc5c7c27fdbbb7887f3a77212a49726cede diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 35afc8d2..32cbd755 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 35afc8d21b2f705463ec56d3e11679efb798b757 +Subproject commit 32cbd7556dfbf4deb20c704b8ac6a481ddd047ae diff --git a/qtrepotools b/qtrepotools index 4370cfe2..7fc65858 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4370cfe245a402e41c8c33ddac5014dfa6b226c0 +Subproject commit 7fc65858bf56ba4533ab3ef391adb63334d9dd98 diff --git a/qtscript b/qtscript index 3a358430..36300dd0 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3a358430efe797fe1c0f1aa7f701f9139a642d6f +Subproject commit 36300dd06bb8191800ec93ca5a408f39b1f221eb diff --git a/qtscxml b/qtscxml index bae669b3..61ed1a9e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bae669b37d3828eb73e78e7c77f0a5fccf8e3150 +Subproject commit 61ed1a9e09fe54b0d52afbf865de03c8c4eaed82 diff --git a/qtsensors b/qtsensors index 63c972ad..53ce60e9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 63c972ad9e15b673779147c4c263ed2ac5312a28 +Subproject commit 53ce60e9f9bf8a6c6b6f1c293564998b431987be diff --git a/qtserialbus b/qtserialbus index a3aa54e2..8b1a6de7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a3aa54e27094b80feae4e42c5f7e22c3d4022b49 +Subproject commit 8b1a6de795523156a5a74dd2a544d866a8beeb53 diff --git a/qtspeech b/qtspeech index 451a120a..d8f4cfd5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 451a120ad9dc1ec23e11720691dd3797cd683848 +Subproject commit d8f4cfd515cca34cb6bcba06f59db231cebf8e09 diff --git a/qtsvg b/qtsvg index f48bf029..215a6642 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f48bf0293a682aef90e6e5b16cf5a9a06b7a32d2 +Subproject commit 215a6642a48b1272a54ce2d125346fa0b8c89847 diff --git a/qttools b/qttools index d8a971b8..3dc4d2a3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d8a971b8475035f61e1ad3baaef6a8c49556c42d +Subproject commit 3dc4d2a3b22eefa11ac1b8a3a908b0a6721ed3d9 diff --git a/qttranslations b/qttranslations index 9d743758..fc73b5db 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9d7437583d7475aa069ec5aa786fa9c5aa36253b +Subproject commit fc73b5dbf6d7719dca652a1cf3aa71ba5d58f8ce diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 39a3c50f..95be4f1e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 39a3c50f6f3d3aff52853510543388638a2524d5 +Subproject commit 95be4f1e3945f88adc9d55fa06371665254a1127 diff --git a/qtwayland b/qtwayland index cfc40436..9bea5d5c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cfc4043626e05649e51607a92ceb87d31e0d1b06 +Subproject commit 9bea5d5cb8f48bd5602e1a45cf8817f7e5f320c8 diff --git a/qtwebchannel b/qtwebchannel index facf59c1..1f793c88 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit facf59c1eae3958b8c2972c167cede215219c814 +Subproject commit 1f793c887773f9b7477a73467aa1e2497ffef25c diff --git a/qtwebengine b/qtwebengine index d9349a29..18df1a7b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d9349a299f66fb154ad24f410451872a7ca253fb +Subproject commit 18df1a7b9282c42ee862403c4523a40e2321c458 diff --git a/qtwebsockets b/qtwebsockets index 127d4753..5bc1a1f8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 127d475324c2133b8d7e2f4712e71d14fa84c560 +Subproject commit 5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 diff --git a/qtwinextras b/qtwinextras index 00fe7a58..d5310efd 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 00fe7a58b9b4ffe6caa7c3e14d5af40c824c0a80 +Subproject commit d5310efd2fbbe9786a4257f3ada78381cb54da23 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2dfdd4f0..837fe162 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2dfdd4f0bdd6647c104470712f0e463021488e43 +Subproject commit 837fe1627fce599bfb9a906d33d14df34648ba89 -- cgit v1.2.3 From d3c777f18e5b86309945ceec954bf85411cbb19f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Mar 2020 22:31:13 +0100 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I716a8496b64c70be454ff36edb936bc9f11a3df5 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 4a1de178..d678827f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4a1de178c9cc891560f38d64d89074799b0fa0e1 +Subproject commit d678827f11263cb7c53218448c9bcc9afbd1439f diff --git a/qtconnectivity b/qtconnectivity index 0282c2fc..962f282d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0282c2fc4ae437cb4f549f25f3e748a90e64f864 +Subproject commit 962f282d21e62b8ddc170cd62cbd918f56493ab8 diff --git a/qtdeclarative b/qtdeclarative index 83fdcbf3..254a5625 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 83fdcbf3be0ddbbee1fd2c8c9ff1a4e3c707e3f0 +Subproject commit 254a56252874b63430701351dcd8c9bef8507353 diff --git a/qtmultimedia b/qtmultimedia index 12460a14..6e21318c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 12460a14bde44d1ff7bedd75bc87c7f22d096588 +Subproject commit 6e21318ca9748e6ddaf9f38052b7896e63ebb81f diff --git a/qtqa b/qtqa index dc43cb91..25a39da9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc43cb91261083f85d8fdea8068bf91fa5621351 +Subproject commit 25a39da9b7bacebc29ee5ffa688fa4953a6ab3dd diff --git a/qtrepotools b/qtrepotools index 7fc65858..8df45087 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7fc65858bf56ba4533ab3ef391adb63334d9dd98 +Subproject commit 8df45087d7b9d67e01de3ff7163acf8bb32e3cb1 diff --git a/qttools b/qttools index ce895f06..d482bfef 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ce895f066579f71d87c3b46361e291ad7734e88e +Subproject commit d482bfef233be2aea221533dd0c4bd695875fad7 diff --git a/qtwebengine b/qtwebengine index 19444168..171bdc9f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 19444168395424fef4daff76ce64b9813aef0610 +Subproject commit 171bdc9f0e9a563b0d70643637d0b6a8e5661d17 -- cgit v1.2.3 From b263f0a2d1c060881e186663dc7b8c4f68990aac Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 27 Feb 2020 03:08:28 +0300 Subject: Provisioning: Install Conan packages for VS2019 Change-Id: Ibbee96ea7ad9e054e1521c897206c9863acc9c08 Reviewed-by: Heikki Halmet --- .../conanmanifest.txt | 250 +++++++++++++++++++++ .../conanmanifest.txt | 250 +++++++++++++++++++++ .../conanmanifest.txt | 12 + .../conanmanifest.txt | 12 + .../conanmanifest.txt | 56 +++++ .../conanmanifest.txt | 56 +++++ .../conanmanifest.txt | 37 +++ .../conanmanifest.txt | 37 +++ .../qtci-windows-10-x86_64/11-conan.ps1 | 16 ++ 9 files changed, 726 insertions(+) create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt new file mode 100644 index 00000000..29781a54 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt @@ -0,0 +1,250 @@ +1582255516 +bin/derb.exe: d93a62f01851ea95efc58eb4f3e791d4 +bin/escapesrc.exe: 75766f460e5dd0ef808b120c732d92c7 +bin/genbrk.exe: 4da632c505bd5b926a89a6dd7b650596 +bin/genccode.exe: 41877ba4b04cf49f636a263aae4f2886 +bin/gencfu.exe: 525a49626036d2aa86e8bfc18b45b465 +bin/gencmn.exe: b15da25db0862b3849b93253b645bd16 +bin/gencnval.exe: 98574f94180b8bd9ff07ef5eeac235f7 +bin/gendict.exe: ee8fa0b65b6a843c8e92079a0d301941 +bin/gennorm2.exe: 385efdd848fe0e109ae5ee72dc36f42a +bin/genrb.exe: 148d9244a745bad05dd0673c110bfa1a +bin/gensprep.exe: be0b6b49063cff5266a8b37bbd91bb4a +bin/icu-config: 834abc11547153b24a70aae3f4df2ac3 +bin/icudt.dll: 03d96a7e1c900cf203bdca34ea180587 +bin/icudt65.dll: 53718118d1f9fac7737f13a072f4e1cb +bin/icuin.dll: ad70d6cc6d9224b69b09ec3ee1f21b1b +bin/icuin65.dll: ad70d6cc6d9224b69b09ec3ee1f21b1b +bin/icuinfo.exe: 2acbbb839cca99cf9027c4de7fc818f5 +bin/icuio.dll: c09966904d088940c4ccf498302d4712 +bin/icuio65.dll: c09966904d088940c4ccf498302d4712 +bin/icupkg.exe: 6461f7ae7163bdc1d542d450eeff22ce +bin/icutest.dll: 91bc1bd35f625900ca74f90373a1b811 +bin/icutest65.dll: 91bc1bd35f625900ca74f90373a1b811 +bin/icutu.dll: 2d9def13c1f8a2c6b99d43feb3d37d6a +bin/icutu65.dll: 2d9def13c1f8a2c6b99d43feb3d37d6a +bin/icuuc.dll: ac883bcb5dda0de14c7789bb0cfa0d0f +bin/icuuc65.dll: ac883bcb5dda0de14c7789bb0cfa0d0f +bin/makeconv.exe: fbf44ce800fb2377ca93b022aa6c4e24 +bin/pkgdata.exe: bb2da4ab37e16ff6c0fe037f431a7920 +conaninfo.txt: d3efa735bfabe1d967065dfa9682bce6 +include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 +include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff +include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 +include/unicode/brkiter.h: e5ff475b7b01a97e5cd11a5362785921 +include/unicode/bytestream.h: 34a6807cd42f2e64ca60429897eb4b10 +include/unicode/bytestrie.h: d9be048d5c7e9dd0a2c6cd82e91e6002 +include/unicode/bytestriebuilder.h: 66236ad8247bd04c9ea525012b4c4ca8 +include/unicode/calendar.h: 692005b416fc2e4a8c497ff9b9a31bd8 +include/unicode/caniter.h: a70809c92ea90b654e9f11a793f84429 +include/unicode/casemap.h: d088e7422633b4cad3ad2b0b83ca239b +include/unicode/char16ptr.h: c234b9ba14299c6068f5af1a936c1ead +include/unicode/chariter.h: c8623016adba39ab38ef29f38ec87e45 +include/unicode/choicfmt.h: 832e7b39d19ec192ac1551360436f946 +include/unicode/coleitr.h: d9f07937d600ee811c121c0b0504724c +include/unicode/coll.h: a2062360d7415e08abb01c44088f074e +include/unicode/compactdecimalformat.h: 029f9640501bd640495c18397b5ff8bb +include/unicode/curramt.h: 41fc0e62956b2e0fa7fd5e05213afc85 +include/unicode/currpinf.h: 09cbc4d9eb04b2aa2c4c155961f13c89 +include/unicode/currunit.h: 43648726f439d03c8c8a13b87c122332 +include/unicode/datefmt.h: 28ef92e98cdac29630b0aa0daf122798 +include/unicode/dbbi.h: 3d4186ec9549d6693d136257f610ec06 +include/unicode/dcfmtsym.h: b18b90c0c6371eab5028582492859142 +include/unicode/decimfmt.h: fb4231ddf75de524300ee952634ef038 +include/unicode/docmain.h: 697c221351932e373cf9e5903f40b723 +include/unicode/dtfmtsym.h: cabbccbf9deec91ebf291a19110007fb +include/unicode/dtintrv.h: 7a7ce170e6035b90ef5b4bee91893833 +include/unicode/dtitvfmt.h: da220b13a8f895c4e77b653d865eb049 +include/unicode/dtitvinf.h: 1ad6b7f844a9362b2b7a0f509284cae7 +include/unicode/dtptngen.h: 8f8fcb053b5024c5b1d3dfc258f59344 +include/unicode/dtrule.h: 68551564f8ab72271d3574aa0cba381d +include/unicode/edits.h: 6b8aa73dbf2c2f0b49da5bc5903bcc8c +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: debeda4467a19aaf964fafc73629c8ae +include/unicode/fieldpos.h: 3b041c7d9a5df0aef744b88e764af17e +include/unicode/filteredbrk.h: e54dd29247eb75f8490423f7f8541691 +include/unicode/fmtable.h: 3816f155db2c35ac5de3f80ffdaa549c +include/unicode/format.h: 0417863e1b303fa282659c4903e3a11c +include/unicode/formattedvalue.h: fc50c8972404b212799d76cf8e647888 +include/unicode/fpositer.h: b5e8bbc249dc37e3b159f0a2b5053957 +include/unicode/gender.h: 5e093c1cfb96ef671f2e5dedb96a0d64 +include/unicode/gregocal.h: 15c7b4ceaca9b8b8f8e747d5427aa7a7 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: a7c3650d5311edeb01f754c574d0fb8b +include/unicode/listformatter.h: 65911d72679c6e0a267e951b03467f37 +include/unicode/localebuilder.h: 1b6106448cf6cde7e7ebf25ee6fe4065 +include/unicode/localematcher.h: 3a03cbb5970a14fe153041c878f583f2 +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: aa260a00e31e970757e3b3cbe00fff3d +include/unicode/locid.h: 6caa36f85c9bab54b78ecd0c056789aa +include/unicode/measfmt.h: 21b534367e4b3825dc70c3a289822df8 +include/unicode/measunit.h: 0f903f67958ad91e8bd2e49fc40c3075 +include/unicode/measure.h: 49091c823a2f12f5f60f7fecd7c452f2 +include/unicode/messagepattern.h: 15ecc58806c256ac91c2549d4f5c242f +include/unicode/msgfmt.h: f9ff9322fa80486203829c15d4982573 +include/unicode/normalizer2.h: 436d923df3a66774b7bf26ffe75a5d1c +include/unicode/normlzr.h: 5bf33ff933ee7eb49c330df38f490f57 +include/unicode/nounit.h: 2b4901f562077b370d82c4bbe229aac4 +include/unicode/numberformatter.h: 0f62c292f92d5598a61647bbf4294e1a +include/unicode/numberrangeformatter.h: 58623918bf66f1fd6687f3dd03180a4b +include/unicode/numfmt.h: 2a21117116463390ec4f19d53f485890 +include/unicode/numsys.h: 186ba43c003b4f56af3c63abd08f418e +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: 5c53fa7c473d4593fd72ce964b505807 +include/unicode/platform.h: 56fe53b31059acb1be086c45ce88e8c6 +include/unicode/plurfmt.h: 6f1b781b7a62a6ac1c7e4c6a2bb18d77 +include/unicode/plurrule.h: cf4b0b9ec1a525b96e7d27e489044337 +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: 6c5f44ef812dfb48b65466732513c091 +include/unicode/rbnf.h: e870f2cf64c9b72eb549c413d6f98299 +include/unicode/rbtz.h: ea9f5a1edac3fe535ec7b83636daf61d +include/unicode/regex.h: 16565e3d41228a76f17a63842d9594d2 +include/unicode/region.h: 22585a516ee7525f3e9094f2843b7640 +include/unicode/reldatefmt.h: 1b226903d9375471432582c27ade4934 +include/unicode/rep.h: eab550a9bbb33b4c1283ab16bc2dfafa +include/unicode/resbund.h: cc93ada0e9871eee0a86f81548a3be73 +include/unicode/schriter.h: acea2a510e5c9127dad0e2538cf65ccd +include/unicode/scientificnumberformatter.h: 40eb759fc2902b6c8e732b440fe6a1bc +include/unicode/search.h: a93ebdadfc5113f1b9c9c185262ef461 +include/unicode/selfmt.h: 581ab6f6ac584265d5c56dad4051ee12 +include/unicode/simpleformatter.h: 8e5e9a9589359e06110af10bcf941d54 +include/unicode/simpletz.h: 194e0d388b74daa4cf51d012e2d14ebd +include/unicode/smpdtfmt.h: 0e6383eafd569b511791e826b51df8d1 +include/unicode/sortkey.h: 27f3d671f37c27d0b36953d00c1f2e7b +include/unicode/std_string.h: bb3b2e28a2ae9b66a60b7d90f8c07512 +include/unicode/strenum.h: 3c23eb4fa4d847b6afdd18adf3ccdaf5 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 3d7911a3b2a59830eaceb37e46110285 +include/unicode/stringtriebuilder.h: 08ce10a0f6e85f4bb078f69d5382f8bc +include/unicode/stsearch.h: b15838a5cf5740b0aaa9af5356aef26b +include/unicode/symtable.h: 7487ffc7069316553d08f1109965bf9d +include/unicode/tblcoll.h: ee27157293d0802cde26d75c6098c1d3 +include/unicode/timezone.h: 54689b5ef15d0f03a146e8aeac163be8 +include/unicode/tmunit.h: 9ddf31866353dde1ae249ed93fce9234 +include/unicode/tmutamt.h: beea411e9f16d8b91fef39a297cd06d8 +include/unicode/tmutfmt.h: ae13f8ac46ad754bf83142943b19a647 +include/unicode/translit.h: f225620498133e8e4bcc2ad6679225e5 +include/unicode/tzfmt.h: b6c94cd901ffe5387f0245ca9fd68604 +include/unicode/tznames.h: a50010925037c01304c719e47bfb369a +include/unicode/tzrule.h: 0e3465c0eeb27a0545f94bf9f5cfc21e +include/unicode/tztrans.h: 117392a0dc2fe373946aecfa74475842 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: d247badde5d39cc16e06d26153054c85 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: ebac2b0b753a1cd10db2f428736bf06d +include/unicode/ucharstrie.h: 16d3d38154f1444b8a3425254ab7ab81 +include/unicode/ucharstriebuilder.h: b92f18132f6c1d61da0ad51b8099435d +include/unicode/uchriter.h: a356cb90d62d9e425e5efbb071c30b21 +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: 47c1acc6c2bde098f0b06c8590d68b9f +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 80678a12de446cdf8679cdd5792a12e9 +include/unicode/ucpmap.h: 0b16934410c99981d87ddd10e1759bed +include/unicode/ucptrie.h: 7450de71dd5e1a83f5290da33d48d40d +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 5de7a80ece54cf7583e19f292ad17825 +include/unicode/udat.h: c665d53e4691b564ae5394957fcdcf31 +include/unicode/udata.h: 98e2327300a26bbaf40bd8eb7eee8c1a +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: ce0332b911d1a820a0b45922bd0e97fc +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: e1e69e0927595423076481b8f948fd2a +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 21277400caea3c7e7fdb57457c10e423 +include/unicode/uloc.h: 39d42620d3a97a7ae26d7b560ea3eacc +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: 0a7fe7df81aedd43f322a9ec540feff5 +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 5dc81c63a8b2c80ffd401c9bb5180e61 +include/unicode/unifilt.h: e170c06bf1bf81a56c7ed605d41fa02f +include/unicode/unifunct.h: 23981a5088ba5d5af70309b73eef7666 +include/unicode/unimatch.h: 66161ce491e3b24e9e011cfc0e78be42 +include/unicode/unirepl.h: 462716fd44618949b405645ba7b5c8e6 +include/unicode/uniset.h: cb94f902233b2e1807156afe0967e3e0 +include/unicode/unistr.h: 5ebe061e4a17e981bb249c4814f4dd9d +include/unicode/unorm.h: ca96f37ed2e2afd56585a238d73cea51 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: 656d2aa9a41ca4b7bfad0a09420bdc23 +include/unicode/unumberformatter.h: 9be73b6bb76bb5862a8dfd615e563b82 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: b56a28b01e3df9088315aeb145ec3a8e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 1642d190b583bbaaf454ac65a37a8024 +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: 1f3fcea9dc6c40e908992e74f602235f +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: ab1ebd4b0b9e3560a94a7c6cb3a9e48f +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 8b9508cbe045b114f0f618d04fcab512 +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 0a74df2b9d1967d0b859d21f5828f4e8 +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: 89a08f750d0c5751d4f385c4874c0e61 +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: 147fbb88d8300af3e38d80ce59c1c1ce +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7f0c4c02bd7506e80fd11a4597cc1450 +include/unicode/utf_old.h: 92ffc297b71c8d83ed05b644183c477c +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 420d2f8d462ae300ca1903c2a6ebaba3 +include/unicode/utrans.h: 5cd9b1f130197e5fdd8a66519233abf5 +include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 +include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 +include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 +include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 +lib/icu/65.1/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/65.1/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icu/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/current/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/current/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icu/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icudt.lib: ad50da716c0eb6bcdc66a7af5d049876 +lib/icuin.lib: d8b960575d5737a7e80a0eaf77a0ccd3 +lib/icuio.lib: 5edd899a7b0a07ef963258ee9adb4558 +lib/icutest.lib: 192e87c4ce05c5eda7a2697127b133b3 +lib/icutu.lib: 30f71a2ff5da26365e87511eff019264 +lib/icuuc.lib: b2df448006c67b3ba595ec3096a58286 +lib/pkgconfig/icu-i18n.pc: 6edbc25754da101395bb827058b3066e +lib/pkgconfig/icu-io.pc: 3354070d7484f6e3ef09f18e28290679 +lib/pkgconfig/icu-uc.pc: 2c56fbbb59cde31869da0e5b0224c770 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/config/mh-msys-msvc: c3bf313c25288142820e4ab191c1c153 +share/icu/65.1/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/65.1/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: bddb017162105939f6d43c9539c99497 +share/man/man1/genbrk.1: a4e60e4a60ab26eb29119649bfb60d2b +share/man/man1/gencfu.1: 4950b8178b944a3ebfea1c419ffd3319 +share/man/man1/gencnval.1: 53b10d9351473a7ea603400973377a7d +share/man/man1/gendict.1: 9c1bf2760e5735b0e6601f48e92cb0d9 +share/man/man1/genrb.1: ffebc1e8007bd58f5623299e6b4babe8 +share/man/man1/icu-config.1: f4670ca16d77ce21310e48aa91f7ee5b +share/man/man1/makeconv.1: c96397ad56d2c21649757c407aac46d8 +share/man/man1/pkgdata.1: 5f7b05c28de887cca1e5d7bfb9db4c39 +share/man/man8/genccode.8: 498418dc0aec1fa7ccfb83c491b5a23e +share/man/man8/gencmn.8: c43635e431ea0f1616ea8266e36c0d75 +share/man/man8/gensprep.8: 396d70fec1a04aae25e6bfc6e8e58c65 +share/man/man8/icupkg.8: 430bcbed42faa9ea33b161a48c0490c6 diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt new file mode 100644 index 00000000..6f0c7a16 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt @@ -0,0 +1,250 @@ +1582256246 +bin/derb.exe: e6041fdf335b5a524557f138c869cc84 +bin/escapesrc.exe: 9cfd048a6bf3519b17f30df342966a33 +bin/genbrk.exe: 752b9f024858391ddbec6403bfb2048a +bin/genccode.exe: 0369bda45bcbeb73f0915b74287d9ad5 +bin/gencfu.exe: ca626c73c414e88b65d934fa48a8f506 +bin/gencmn.exe: 8626f0646549407b32ac13d6e1952fd6 +bin/gencnval.exe: 3864bdb0a1b41b22d0582cb938cfcd5e +bin/gendict.exe: a409064c7b8458063022de5fb14808b5 +bin/gennorm2.exe: 646e92dfa248ab1b06e4486b885a57ec +bin/genrb.exe: 346551698bd19f0d29a57f1ed4f2fde7 +bin/gensprep.exe: 95680f967adc685b197756ba265cd7ef +bin/icu-config: 09fb7ddac5b9883611c1f2fefb28e692 +bin/icudt.dll: a9192d258154160b288d939bb1eb3f96 +bin/icudt65.dll: 3a45a96f7e1e69d427063fe3627b1a38 +bin/icuin.dll: ab4224faef23c6b0bcb0601b44dd39b9 +bin/icuin65.dll: ab4224faef23c6b0bcb0601b44dd39b9 +bin/icuinfo.exe: abc421ec846b8d7dac99b1f4d296773d +bin/icuio.dll: cab9b7f62754cbe7bce23d07bce9fedc +bin/icuio65.dll: cab9b7f62754cbe7bce23d07bce9fedc +bin/icupkg.exe: bc5f4f3f340b4621df456c4aed4073c2 +bin/icutest.dll: 921c386181ff37db17e063bc4cf55a62 +bin/icutest65.dll: 921c386181ff37db17e063bc4cf55a62 +bin/icutu.dll: f72c49d172522323d7069a96224d89a9 +bin/icutu65.dll: f72c49d172522323d7069a96224d89a9 +bin/icuuc.dll: afe869974d32eedcf1289b5592ea007c +bin/icuuc65.dll: afe869974d32eedcf1289b5592ea007c +bin/makeconv.exe: 5f302e72bc98f33db337fdb644c79181 +bin/pkgdata.exe: a48d51ee2d5a1e6d71dd2d7e98dc69be +conaninfo.txt: ebe8d1091c909c57853d44504c05ac72 +include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 +include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff +include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 +include/unicode/brkiter.h: e5ff475b7b01a97e5cd11a5362785921 +include/unicode/bytestream.h: 34a6807cd42f2e64ca60429897eb4b10 +include/unicode/bytestrie.h: d9be048d5c7e9dd0a2c6cd82e91e6002 +include/unicode/bytestriebuilder.h: 66236ad8247bd04c9ea525012b4c4ca8 +include/unicode/calendar.h: 692005b416fc2e4a8c497ff9b9a31bd8 +include/unicode/caniter.h: a70809c92ea90b654e9f11a793f84429 +include/unicode/casemap.h: d088e7422633b4cad3ad2b0b83ca239b +include/unicode/char16ptr.h: c234b9ba14299c6068f5af1a936c1ead +include/unicode/chariter.h: c8623016adba39ab38ef29f38ec87e45 +include/unicode/choicfmt.h: 832e7b39d19ec192ac1551360436f946 +include/unicode/coleitr.h: d9f07937d600ee811c121c0b0504724c +include/unicode/coll.h: a2062360d7415e08abb01c44088f074e +include/unicode/compactdecimalformat.h: 029f9640501bd640495c18397b5ff8bb +include/unicode/curramt.h: 41fc0e62956b2e0fa7fd5e05213afc85 +include/unicode/currpinf.h: 09cbc4d9eb04b2aa2c4c155961f13c89 +include/unicode/currunit.h: 43648726f439d03c8c8a13b87c122332 +include/unicode/datefmt.h: 28ef92e98cdac29630b0aa0daf122798 +include/unicode/dbbi.h: 3d4186ec9549d6693d136257f610ec06 +include/unicode/dcfmtsym.h: b18b90c0c6371eab5028582492859142 +include/unicode/decimfmt.h: fb4231ddf75de524300ee952634ef038 +include/unicode/docmain.h: 697c221351932e373cf9e5903f40b723 +include/unicode/dtfmtsym.h: cabbccbf9deec91ebf291a19110007fb +include/unicode/dtintrv.h: 7a7ce170e6035b90ef5b4bee91893833 +include/unicode/dtitvfmt.h: da220b13a8f895c4e77b653d865eb049 +include/unicode/dtitvinf.h: 1ad6b7f844a9362b2b7a0f509284cae7 +include/unicode/dtptngen.h: 8f8fcb053b5024c5b1d3dfc258f59344 +include/unicode/dtrule.h: 68551564f8ab72271d3574aa0cba381d +include/unicode/edits.h: 6b8aa73dbf2c2f0b49da5bc5903bcc8c +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: debeda4467a19aaf964fafc73629c8ae +include/unicode/fieldpos.h: 3b041c7d9a5df0aef744b88e764af17e +include/unicode/filteredbrk.h: e54dd29247eb75f8490423f7f8541691 +include/unicode/fmtable.h: 3816f155db2c35ac5de3f80ffdaa549c +include/unicode/format.h: 0417863e1b303fa282659c4903e3a11c +include/unicode/formattedvalue.h: fc50c8972404b212799d76cf8e647888 +include/unicode/fpositer.h: b5e8bbc249dc37e3b159f0a2b5053957 +include/unicode/gender.h: 5e093c1cfb96ef671f2e5dedb96a0d64 +include/unicode/gregocal.h: 15c7b4ceaca9b8b8f8e747d5427aa7a7 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: a7c3650d5311edeb01f754c574d0fb8b +include/unicode/listformatter.h: 65911d72679c6e0a267e951b03467f37 +include/unicode/localebuilder.h: 1b6106448cf6cde7e7ebf25ee6fe4065 +include/unicode/localematcher.h: 3a03cbb5970a14fe153041c878f583f2 +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: aa260a00e31e970757e3b3cbe00fff3d +include/unicode/locid.h: 6caa36f85c9bab54b78ecd0c056789aa +include/unicode/measfmt.h: 21b534367e4b3825dc70c3a289822df8 +include/unicode/measunit.h: 0f903f67958ad91e8bd2e49fc40c3075 +include/unicode/measure.h: 49091c823a2f12f5f60f7fecd7c452f2 +include/unicode/messagepattern.h: 15ecc58806c256ac91c2549d4f5c242f +include/unicode/msgfmt.h: f9ff9322fa80486203829c15d4982573 +include/unicode/normalizer2.h: 436d923df3a66774b7bf26ffe75a5d1c +include/unicode/normlzr.h: 5bf33ff933ee7eb49c330df38f490f57 +include/unicode/nounit.h: 2b4901f562077b370d82c4bbe229aac4 +include/unicode/numberformatter.h: 0f62c292f92d5598a61647bbf4294e1a +include/unicode/numberrangeformatter.h: 58623918bf66f1fd6687f3dd03180a4b +include/unicode/numfmt.h: 2a21117116463390ec4f19d53f485890 +include/unicode/numsys.h: 186ba43c003b4f56af3c63abd08f418e +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: 5c53fa7c473d4593fd72ce964b505807 +include/unicode/platform.h: 56fe53b31059acb1be086c45ce88e8c6 +include/unicode/plurfmt.h: 6f1b781b7a62a6ac1c7e4c6a2bb18d77 +include/unicode/plurrule.h: cf4b0b9ec1a525b96e7d27e489044337 +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: 6c5f44ef812dfb48b65466732513c091 +include/unicode/rbnf.h: e870f2cf64c9b72eb549c413d6f98299 +include/unicode/rbtz.h: ea9f5a1edac3fe535ec7b83636daf61d +include/unicode/regex.h: 16565e3d41228a76f17a63842d9594d2 +include/unicode/region.h: 22585a516ee7525f3e9094f2843b7640 +include/unicode/reldatefmt.h: 1b226903d9375471432582c27ade4934 +include/unicode/rep.h: eab550a9bbb33b4c1283ab16bc2dfafa +include/unicode/resbund.h: cc93ada0e9871eee0a86f81548a3be73 +include/unicode/schriter.h: acea2a510e5c9127dad0e2538cf65ccd +include/unicode/scientificnumberformatter.h: 40eb759fc2902b6c8e732b440fe6a1bc +include/unicode/search.h: a93ebdadfc5113f1b9c9c185262ef461 +include/unicode/selfmt.h: 581ab6f6ac584265d5c56dad4051ee12 +include/unicode/simpleformatter.h: 8e5e9a9589359e06110af10bcf941d54 +include/unicode/simpletz.h: 194e0d388b74daa4cf51d012e2d14ebd +include/unicode/smpdtfmt.h: 0e6383eafd569b511791e826b51df8d1 +include/unicode/sortkey.h: 27f3d671f37c27d0b36953d00c1f2e7b +include/unicode/std_string.h: bb3b2e28a2ae9b66a60b7d90f8c07512 +include/unicode/strenum.h: 3c23eb4fa4d847b6afdd18adf3ccdaf5 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 3d7911a3b2a59830eaceb37e46110285 +include/unicode/stringtriebuilder.h: 08ce10a0f6e85f4bb078f69d5382f8bc +include/unicode/stsearch.h: b15838a5cf5740b0aaa9af5356aef26b +include/unicode/symtable.h: 7487ffc7069316553d08f1109965bf9d +include/unicode/tblcoll.h: ee27157293d0802cde26d75c6098c1d3 +include/unicode/timezone.h: 54689b5ef15d0f03a146e8aeac163be8 +include/unicode/tmunit.h: 9ddf31866353dde1ae249ed93fce9234 +include/unicode/tmutamt.h: beea411e9f16d8b91fef39a297cd06d8 +include/unicode/tmutfmt.h: ae13f8ac46ad754bf83142943b19a647 +include/unicode/translit.h: f225620498133e8e4bcc2ad6679225e5 +include/unicode/tzfmt.h: b6c94cd901ffe5387f0245ca9fd68604 +include/unicode/tznames.h: a50010925037c01304c719e47bfb369a +include/unicode/tzrule.h: 0e3465c0eeb27a0545f94bf9f5cfc21e +include/unicode/tztrans.h: 117392a0dc2fe373946aecfa74475842 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: d247badde5d39cc16e06d26153054c85 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: ebac2b0b753a1cd10db2f428736bf06d +include/unicode/ucharstrie.h: 16d3d38154f1444b8a3425254ab7ab81 +include/unicode/ucharstriebuilder.h: b92f18132f6c1d61da0ad51b8099435d +include/unicode/uchriter.h: a356cb90d62d9e425e5efbb071c30b21 +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: 47c1acc6c2bde098f0b06c8590d68b9f +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 80678a12de446cdf8679cdd5792a12e9 +include/unicode/ucpmap.h: 0b16934410c99981d87ddd10e1759bed +include/unicode/ucptrie.h: 7450de71dd5e1a83f5290da33d48d40d +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 5de7a80ece54cf7583e19f292ad17825 +include/unicode/udat.h: c665d53e4691b564ae5394957fcdcf31 +include/unicode/udata.h: 98e2327300a26bbaf40bd8eb7eee8c1a +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: ce0332b911d1a820a0b45922bd0e97fc +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: e1e69e0927595423076481b8f948fd2a +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 21277400caea3c7e7fdb57457c10e423 +include/unicode/uloc.h: 39d42620d3a97a7ae26d7b560ea3eacc +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: 0a7fe7df81aedd43f322a9ec540feff5 +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 5dc81c63a8b2c80ffd401c9bb5180e61 +include/unicode/unifilt.h: e170c06bf1bf81a56c7ed605d41fa02f +include/unicode/unifunct.h: 23981a5088ba5d5af70309b73eef7666 +include/unicode/unimatch.h: 66161ce491e3b24e9e011cfc0e78be42 +include/unicode/unirepl.h: 462716fd44618949b405645ba7b5c8e6 +include/unicode/uniset.h: cb94f902233b2e1807156afe0967e3e0 +include/unicode/unistr.h: 5ebe061e4a17e981bb249c4814f4dd9d +include/unicode/unorm.h: ca96f37ed2e2afd56585a238d73cea51 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: 656d2aa9a41ca4b7bfad0a09420bdc23 +include/unicode/unumberformatter.h: 9be73b6bb76bb5862a8dfd615e563b82 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: b56a28b01e3df9088315aeb145ec3a8e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 1642d190b583bbaaf454ac65a37a8024 +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: 1f3fcea9dc6c40e908992e74f602235f +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: ab1ebd4b0b9e3560a94a7c6cb3a9e48f +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 8b9508cbe045b114f0f618d04fcab512 +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 0a74df2b9d1967d0b859d21f5828f4e8 +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: 89a08f750d0c5751d4f385c4874c0e61 +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: 147fbb88d8300af3e38d80ce59c1c1ce +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7f0c4c02bd7506e80fd11a4597cc1450 +include/unicode/utf_old.h: 92ffc297b71c8d83ed05b644183c477c +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 420d2f8d462ae300ca1903c2a6ebaba3 +include/unicode/utrans.h: 5cd9b1f130197e5fdd8a66519233abf5 +include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 +include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 +include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 +include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 +lib/icu/65.1/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/65.1/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icu/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/current/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/current/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icu/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icudt.lib: 5dbe4c8d0feeacf4d9eea9d067a7afc3 +lib/icuin.lib: 45f344989a36defbc1f0f7227308865d +lib/icuio.lib: 33e944538f0f5c890581d2e8840bba83 +lib/icutest.lib: cc355097c595e6c1c4a1cb1e92ed311a +lib/icutu.lib: 5db94d78a0f650efa606d964444b78e8 +lib/icuuc.lib: 80d1fd2e66b136767395e3811227737c +lib/pkgconfig/icu-i18n.pc: 648b5d9ec85b0426e1069c02742b5617 +lib/pkgconfig/icu-io.pc: 34521e04a76356658abd41e3932acd56 +lib/pkgconfig/icu-uc.pc: cb702fa4b4c1fa616e01eb228cebd947 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/config/mh-msys-msvc: c3bf313c25288142820e4ab191c1c153 +share/icu/65.1/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/65.1/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: bddb017162105939f6d43c9539c99497 +share/man/man1/genbrk.1: a4e60e4a60ab26eb29119649bfb60d2b +share/man/man1/gencfu.1: 4950b8178b944a3ebfea1c419ffd3319 +share/man/man1/gencnval.1: 53b10d9351473a7ea603400973377a7d +share/man/man1/gendict.1: 9c1bf2760e5735b0e6601f48e92cb0d9 +share/man/man1/genrb.1: ffebc1e8007bd58f5623299e6b4babe8 +share/man/man1/icu-config.1: f4670ca16d77ce21310e48aa91f7ee5b +share/man/man1/makeconv.1: c96397ad56d2c21649757c407aac46d8 +share/man/man1/pkgdata.1: 5f7b05c28de887cca1e5d7bfb9db4c39 +share/man/man8/genccode.8: 498418dc0aec1fa7ccfb83c491b5a23e +share/man/man8/gencmn.8: c43635e431ea0f1616ea8266e36c0d75 +share/man/man8/gensprep.8: 396d70fec1a04aae25e6bfc6e8e58c65 +share/man/man8/icupkg.8: 430bcbed42faa9ea33b161a48c0490c6 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt new file mode 100644 index 00000000..4f7d3680 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt @@ -0,0 +1,12 @@ +1582282172 +conaninfo.txt: d3531bf4208a49880b6916cb487ca0fd +include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: f1380749e57edaa40366510a55c4a581 +lib/pkgconfig/libjpeg.pc: 46be85b895bb997ec57faee440b199c9 +lib/pkgconfig/libturbojpeg.pc: 891d57d67b7bb2d2246f6c84e3802ff3 +lib/turbojpeg-static.lib: 03531f3967223cb10088dccf1f0ab17e +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt new file mode 100644 index 00000000..acabe605 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt @@ -0,0 +1,12 @@ +1582282050 +conaninfo.txt: 5d70fc12733b9ab4f2eef806064af4fc +include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: dc1e769eef09dec4761fcecb6e25e416 +lib/pkgconfig/libjpeg.pc: 58e4fea9c97c1e8ddfe69f5c7a90ee63 +lib/pkgconfig/libturbojpeg.pc: d8e6f88b279ae6759cf8f0363cb08913 +lib/turbojpeg-static.lib: 34efadab9c45a4be93bb62e415b7bd5b +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt new file mode 100644 index 00000000..0e317ac4 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt @@ -0,0 +1,56 @@ +1582269846 +bin/libxml2.dll: 9807c311cef5ae7c2116871b45bb4398 +bin/xmlcatalog.exe: 3ead86d739b476b2ca12ac46ef1f0707 +bin/xmllint.exe: bd9d34f006212ca595816def045d62f7 +conaninfo.txt: 0768398792af659c3fbe40072a9585d3 +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: 6f2b3ecf12e815ce0159be0fbba1bc4f +include/libxml2/libxml/catalog.h: 382caf85e794d06e84280cf702a42c18 +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: a48513ceb9774ebece2daa8a2cd52f07 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: af6927d60ab5a971b68a65626d903bb2 +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3e149b90da438833f98a1bcd12a0abcb +include/libxml2/libxml/parserInternals.h: 4c3e253f541b903f061a2ef7fadcdc35 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 5072dee68b3423ac6f13185b984cc325 +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 406fe7a05a1503755da736b98b1ab781 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 0f722691abab1f60d5a9f0c14bbb26c4 +include/libxml2/libxml/xmlIO.h: cb4be47d203f7d54f374b9272db7e3f3 +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 28cd85987165565f9306b9b66a2b4e88 +include/libxml2/libxml/xmlexports.h: 27052360fc0021d99870d8f49371dae0 +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: 1e9e77170ee677ce49956476e0f845d6 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: bfe49b59c50e544f6e7a72423159775a +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e +include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c +lib/libxml2.lib: 7fcc4938ce977551d281c3b284908fc4 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt new file mode 100644 index 00000000..04b694fb --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt @@ -0,0 +1,56 @@ +1582269689 +bin/libxml2.dll: ae389e2ddae1c43bf9ec445624f47b2a +bin/xmlcatalog.exe: bbc783406f307ead9e208cc053057515 +bin/xmllint.exe: 219e6273a76bff9f81311845cdafbdc5 +conaninfo.txt: fa7291961078c99298606983d6ee6f4f +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: 6f2b3ecf12e815ce0159be0fbba1bc4f +include/libxml2/libxml/catalog.h: 382caf85e794d06e84280cf702a42c18 +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: a48513ceb9774ebece2daa8a2cd52f07 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: af6927d60ab5a971b68a65626d903bb2 +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3e149b90da438833f98a1bcd12a0abcb +include/libxml2/libxml/parserInternals.h: 4c3e253f541b903f061a2ef7fadcdc35 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 5072dee68b3423ac6f13185b984cc325 +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 406fe7a05a1503755da736b98b1ab781 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 0f722691abab1f60d5a9f0c14bbb26c4 +include/libxml2/libxml/xmlIO.h: cb4be47d203f7d54f374b9272db7e3f3 +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 28cd85987165565f9306b9b66a2b4e88 +include/libxml2/libxml/xmlexports.h: 27052360fc0021d99870d8f49371dae0 +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: 1e9e77170ee677ce49956476e0f845d6 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: bfe49b59c50e544f6e7a72423159775a +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e +include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c +lib/libxml2.lib: 7fad5ca5e6d3bcc2115e380257743d75 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt new file mode 100644 index 00000000..6e45a634 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt @@ -0,0 +1,37 @@ +1582271502 +bin/libexslt.dll: dfa355cf061960fb9ac90eb96978efe2 +bin/libxslt.dll: 66d893778ed2fdb0996d65cfafde86c8 +bin/xsltproc.exe: 9758509e1893f33b8a72fac95277173d +conaninfo.txt: 925c32911a6c22d5017050c029b235fe +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: a0afe6a6e6db6ad4dc8bf86d0364f188 +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: adf6b78e6c68a7d34ae680f6dc3f5240 +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: 0c245b0fcc81bf537632a45adf8fcffb +include/libxslt/xsltconfig.h: 5a24e58adcdbe603c43a8f044ba5f763 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a +lib/libexslt.lib: f6157fec5ccb3854968dc422548971f3 +lib/libxslt.lib: 63331e57a1bc5adaa352f3ee2c68b5cd +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt new file mode 100644 index 00000000..8422de36 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt @@ -0,0 +1,37 @@ +1582271394 +bin/libexslt.dll: 1a591c14ad6a05a2fe4a20cf40573e75 +bin/libxslt.dll: 051a19fc29aff43011488ea49d2cf353 +bin/xsltproc.exe: 1105ea2e3f79fdd698feb5fa8858e01e +conaninfo.txt: f5d7a59989b8119bea8988657e0ba42c +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: a0afe6a6e6db6ad4dc8bf86d0364f188 +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: adf6b78e6c68a7d34ae680f6dc3f5240 +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: 0c245b0fcc81bf537632a45adf8fcffb +include/libxslt/xsltconfig.h: 5a24e58adcdbe603c43a8f044ba5f763 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a +lib/libexslt.lib: b10239833b6a5f4f489202cb8b2256bd +lib/libxslt.lib: 0fcb41267f05f802050235fa09e0688f +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index a651bb0c..71abc7e1 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -32,6 +32,22 @@ Run-Conan-Install ` -CompilerVersion 15 ` -CompilerRuntime MD +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2019-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 16 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2019-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 16 ` + -CompilerRuntime MD + Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` -BuildinfoDir Mingw73-x86 ` -- cgit v1.2.3 From b7b6e31d47cda92e6f4e58ba69540b6b8c4a1341 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 28 Feb 2020 22:54:20 +0300 Subject: Provisioning: Install QtWebKit dependencies on Ubuntu 18.04 Change-Id: Ib9a142ed6641436669c31ae8489ab9c89576e77a Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 5 +++++ 1 file changed, 5 insertions(+) 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 89b1eb7f..50eea33b 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 @@ -169,6 +169,11 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for qtwebkit +installPackages+=(ruby) +installPackages+=(libxslt1-dev) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 7ba8c15d79be619c4cef8c0aa76fe9472b3ad7da Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 29 Feb 2020 03:13:17 +0300 Subject: Update platform_configs for QtWebKit * Add 64-bit MinGW config * Don't use DisableTests for 64-bit MinGW, as it's necessary for at least for the purpose of JS engine smoke check * Sync configure flags with qt5.yaml, but not enable forced debug info which causes build issues for both 32-bit and 64-bit configs Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8 Reviewed-by: Heikki Halmet --- coin/platform_configs/qtwebkit.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 0a1d5d31..29291d53 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -2,4 +2,9 @@ Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -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++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -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++ QMAKE_LFLAGS_APP+=-s' +- + Template: 'qtci-windows-10-x86_64-16' + Compiler: 'Mingw73' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -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++ QMAKE_LFLAGS_APP+=-s' -- cgit v1.2.3 From 4c880b3affc4f944557224c59958e2f1f1fa8311 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 3 Mar 2020 06:17:50 +0300 Subject: Provisioning: install dwz 0.13 to RHEL 7.6 It is used for compression of QtWebKit debug info, saving about 1Gb (~40%) for non-compressed debug file of libQt5WebKit.so, and ~50% of 7z-compressed debug package. Version 0.12 provided in RedHat devtoolset exposes a bug when applied to QtWebKit debug info: https://sourceware.org/bugzilla/show_bug.cgi?id=24251 Change-Id: I0395aadfb7babbbc150f367f8b5dd296dc6d2064 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/install_dwz.sh | 71 ++++++++++++++++++++++ .../qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh | 42 +++++++++++++ 2 files changed, 113 insertions(+) create mode 100755 coin/provisioning/common/linux/install_dwz.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh diff --git a/coin/provisioning/common/linux/install_dwz.sh b/coin/provisioning/common/linux/install_dwz.sh new file mode 100755 index 00000000..1df959e2 --- /dev/null +++ b/coin/provisioning/common/linux/install_dwz.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 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$ +## +############################################################################# + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script will install dwz 0.13 - optimization tool for DWARF debug info + +version="0.13" +sha1="21e6d5878bb84ac6c9ad07b00ed248d8c547bc7d" +internalUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/dwz-$version.tar.xz" +externalUrl="https://www.sourceware.org/ftp/dwz/releases/dwz-$version.tar.xz" + +targetDir="$HOME/dwz" +targetFile="$HOME/dwz-$version.zip" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +tar -xJf "$targetFile" -C "$HOME" +sudo rm "$targetFile" + +# devtoolset is needed when running configuration +export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + +installPrefix="/opt/dwz-$version" + +echo "Configuring and building dwz" +cd "$targetDir" +# dwz uses plain makefile instead of autotools, so it works a bit unconventionally +./configure +make -j5 +sudo make install prefix=$installPrefix + +sudo rm -r "$targetDir" + +SetEnvVar "PATH" "$installPrefix/bin:\$PATH" + +echo "dwz = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh new file mode 100755 index 00000000..935d9227 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +set -ex + +sudo yum -y install elfutils-libelf-devel + +# shellcheck source=../common/linux/install_dwz.sh +source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" + -- cgit v1.2.3 From bdaa28c45f0178d724b5edb7dc5cb8eece370e92 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 7 Mar 2020 22:31:08 +0100 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I216fbf259c1b29d5526131e061bcd40a2b7673e6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 597c9df3..8b34a40c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 597c9df33c2c8a9e91e3ad1de48b1200ebca6586 +Subproject commit 8b34a40c2c8e7468633555268cb1bea921e85a75 diff --git a/qtbase b/qtbase index d678827f..c1bb6285 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d678827f11263cb7c53218448c9bcc9afbd1439f +Subproject commit c1bb6285720513b9b22b552ca30af3c1501a7761 diff --git a/qtconnectivity b/qtconnectivity index 962f282d..58e0224a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 962f282d21e62b8ddc170cd62cbd918f56493ab8 +Subproject commit 58e0224a6677667b1102b34ad5b35a787bd74077 diff --git a/qtdeclarative b/qtdeclarative index 254a5625..2bb382f9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 254a56252874b63430701351dcd8c9bef8507353 +Subproject commit 2bb382f9c276a1dc1258148c156222be3576aff5 diff --git a/qtmultimedia b/qtmultimedia index 6e21318c..bc42a549 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e21318ca9748e6ddaf9f38052b7896e63ebb81f +Subproject commit bc42a549a309603ab4afe28b87406a663702aa24 diff --git a/qtpurchasing b/qtpurchasing index ae27a573..35dfb472 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ae27a573d67e1a7c6041b497592174b306bea6e9 +Subproject commit 35dfb472d44bad657b6636221c965bef67d861c2 diff --git a/qtqa b/qtqa index 25a39da9..0a7b4f9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25a39da9b7bacebc29ee5ffa688fa4953a6ab3dd +Subproject commit 0a7b4f9f2fa89020f3525a4387eaa848493b4f60 diff --git a/qtrepotools b/qtrepotools index 8df45087..fbe6d232 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8df45087d7b9d67e01de3ff7163acf8bb32e3cb1 +Subproject commit fbe6d232ba331f08c154465da64a2d2560774427 diff --git a/qtscxml b/qtscxml index 2ac29444..dc27453a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2ac294443a72799c021dcf3513c83fb628f3c193 +Subproject commit dc27453a24ef18082f6f39dcf835092d0d32f913 diff --git a/qtsensors b/qtsensors index 233d2d08..c9e6509d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 233d2d083fc1bca05f6b323e5c3dbc222828d135 +Subproject commit c9e6509d3b1191831e6f4c4cd41aa283f6dfe583 diff --git a/qtserialbus b/qtserialbus index b6387715..275ed191 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b63877157c2c9681ced1efbfefe1d2d1debf812e +Subproject commit 275ed191e6452d7e623cff0cde0beb9e416a8e46 diff --git a/qtwayland b/qtwayland index e4e03650..0f0fbf0a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e4e03650dbbc1f98ba90d15364d9c951a7e7506b +Subproject commit 0f0fbf0a70940379a99618d2069721471e3fc631 diff --git a/qtwebengine b/qtwebengine index 171bdc9f..9377855e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 171bdc9f0e9a563b0d70643637d0b6a8e5661d17 +Subproject commit 9377855eb7c2310951d67e0fe5454be35fefd72c diff --git a/qtwebview b/qtwebview index ebf92b96..12420abb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ebf92b96ee6808f67e62449dc65b3757bf41d9d4 +Subproject commit 12420abbfa66e03938571528647be6f6d9034aa7 -- cgit v1.2.3 From 3b264301b00dc58f58a45d7221cbe0dfc025d2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 10 Jan 2020 13:07:49 +0000 Subject: Update openSUSE to 15.1 Task-number: QTQAINFRA-3455 Change-Id: Ie795f19c26ab0c42693388696edb344b4fa121a6 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +- coin/platform_configs/qtbase.yaml | 2 +- .../01-install_telegraf.sh | 3 - .../01-systemsetup.sh | 41 ----------- .../02-disable-ntp.sh | 3 - .../02-zypperpackages.sh | 51 ------------- .../qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh | 7 -- .../08-pythondev.sh | 18 ----- .../qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh | 5 -- .../09-install-openssl.sh | 6 -- .../qtci-linux-openSUSE-15.0-x86_64/18-icc.sh | 86 ---------------------- .../22-mqtt_broker.sh | 37 ---------- .../qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh | 39 ---------- .../qtci-linux-openSUSE-15.0-x86_64/90-squish.sh | 4 - .../99-unset-proxy.sh | 39 ---------- .../qtci-linux-openSUSE-15.0-x86_64/99-version.sh | 48 ------------ .../01-install_telegraf.sh | 3 + .../01-systemsetup.sh | 41 +++++++++++ .../02-disable-ntp.sh | 3 + .../02-zypperpackages.sh | 51 +++++++++++++ .../qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh | 7 ++ .../08-pythondev.sh | 18 +++++ .../qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh | 5 ++ .../09-install-openssl.sh | 6 ++ .../qtci-linux-openSUSE-15.1-x86_64/18-icc.sh | 86 ++++++++++++++++++++++ .../22-mqtt_broker.sh | 37 ++++++++++ .../qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh | 39 ++++++++++ .../qtci-linux-openSUSE-15.1-x86_64/90-squish.sh | 4 + .../99-unset-proxy.sh | 39 ++++++++++ .../qtci-linux-openSUSE-15.1-x86_64/99-version.sh | 48 ++++++++++++ 30 files changed, 391 insertions(+), 391 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ea57fb93..096d2504 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -55,16 +55,16 @@ Configurations: 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-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-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-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-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-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 680a9bbf..f1b6ca7b 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -19,7 +19,7 @@ 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-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh deleted file mode 100755 index d3724ceb..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/network_test_server_ip.txt -source "$BASEDIR/../common/shared/network_test_server_ip.txt" -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" - -# https://bugzilla.opensuse.org/show_bug.cgi?id=1032027 -sudo btrfs quota disable / - -sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc - -sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub -sudo grub2-mkconfig -o /boot/grub2/grub.cfg - -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 -echo "Disabling file indexing." -sudo balooctl disable - -sudo systemctl stop packagekit -sudo systemctl disable packagekit -sudo systemctl mask packagekit -while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do - echo "Waiting for PackageKit to finish..." - sleep 0.5 -done -echo "Disabling update notifications" -sudo zypper -nq remove plasma5-pk-updates - - -# shellcheck disable=SC2031 -if [ "$http_proxy" != "" ]; then - sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy - sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy -fi diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh deleted file mode 100755 index 38707a8a..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh deleted file mode 100755 index d1f3050f..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -sudo zypper -nq install git gcc7 gcc7-c++ -sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ - --slave /usr/bin/cc cc /usr/bin/gcc-7 \ - --slave /usr/bin/c++ c++ /usr/bin/g++-7 - -sudo zypper -nq install bison flex gperf \ - zlib-devel \ - libudev-devel \ - glib2-devel \ - libopenssl-devel \ - freetype2-devel \ - fontconfig-devel \ - sqlite3-devel \ - libxkbcommon-devel \ - libxkbcommon-x11-devel - -# EGL support -sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel - - -# Xinput2 -sudo zypper -nq install libXi-devel - -# system provided XCB libraries -sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ - xcb-util-wm-devel xcb-util-renderutil-devel - -# ICU -sudo zypper -nq install libicu-devel libicu60_2 - -# qtwebengine -sudo zypper -nq install alsa-devel dbus-1-devel \ - libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel - -# qtwebkit -sudo zypper -nq install libxml2-devel libxslt-devel - -# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) -sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel - -# cups -sudo zypper -nq install cups-devel - -#speech-dispatcher -sudo zypper -nq install libspeechd-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh deleted file mode 100755 index bbe2b4b4..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh +++ /dev/null @@ -1,7 +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-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh deleted file mode 100755 index 12dabace..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside - -set -ex - -sudo zypper -nq install python-devel python-virtualenv - -# install python3 -sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel - -# Install all needed packages in a special wheel cache directory -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-openSUSE-15.0-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh deleted file mode 100755 index 5eb53566..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -"$(dirname "$0")/../common/linux/cmake_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 deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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-openSUSE-15.0-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh deleted file mode 100755 index 7ab8528a..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh +++ /dev/null @@ -1,86 +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 install Intel Parallel Studio XE Composer Edition for C++ Linux - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -set -ex - -mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" -localMount="/mnt/storage/" - -iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" -iccPackageSource="$localMount/intel/$iccPackage" -iccInstallPath="/opt/intel" -iccTmpPath="/tmp/icc" - -iccLicense="l_icc_2018.lic" -iccLicenseSource="$localMount/semisecure/$iccLicense" -iccLicenseTarget="/home/qt/$iccLicense" - -iccInstallInstructions="$iccTmpPath/instructions.txt" - -sudo mkdir -p "$localMount" -sudo mount "$mainStorage" "$localMount" -mkdir -p "$iccTmpPath" -tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 - -cp "$iccLicenseSource" "$iccLicenseTarget" - -sudo umount "$localMount" - -cat >"$iccInstallInstructions" <>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.1 20171018" >> ~/versions.txt - -rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh deleted file mode 100755 index e677427f..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-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-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh deleted file mode 100755 index 44cf1b80..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh +++ /dev/null @@ -1,39 +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/emsdk.sh -source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-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-openSUSE-15.0-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh deleted file mode 100755 index 5ff78055..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.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 - -# Having proxy set while running autotests makes them fail -sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy - diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh deleted file mode 100755 index 03565da2..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-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-openSUSE-15.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..d3724ceb --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +# https://bugzilla.opensuse.org/show_bug.cgi?id=1032027 +sudo btrfs quota disable / + +sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc + +sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +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 +echo "Disabling file indexing." +sudo balooctl disable + +sudo systemctl stop packagekit +sudo systemctl disable packagekit +sudo systemctl mask packagekit +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 0.5 +done +echo "Disabling update notifications" +sudo zypper -nq remove plasma5-pk-updates + + +# shellcheck disable=SC2031 +if [ "$http_proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..38707a8a --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..d1f3050f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +set -ex + +sudo zypper -nq install git gcc7 gcc7-c++ +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ + --slave /usr/bin/cc cc /usr/bin/gcc-7 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + + +# Xinput2 +sudo zypper -nq install libXi-devel + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu60_2 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +#speech-dispatcher +sudo zypper -nq install libspeechd-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh new file mode 100755 index 00000000..bbe2b4b4 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh @@ -0,0 +1,7 @@ +#!/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-openSUSE-15.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh new file mode 100755 index 00000000..ab966a02 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +set -ex + +sudo zypper -nq install python-devel python-xml + +# install python3 +sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel + +# Install all needed packages in a special wheel cache directory +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-openSUSE-15.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh new file mode 100755 index 00000000..5eb53566 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-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-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh new file mode 100755 index 00000000..7ab8528a --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh @@ -0,0 +1,86 @@ +#!/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 install Intel Parallel Studio XE Composer Edition for C++ Linux + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc_2018.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt + +rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-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-openSUSE-15.1-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh new file mode 100755 index 00000000..44cf1b80 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/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/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-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-openSUSE-15.1-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.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 + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-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 fd2b713a87c3d9f12ec433e442b965efa38e9af1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Mar 2020 05:17:58 +0000 Subject: Update submodules on '5.15' in qt5 Change-Id: I9c8617253ea6355c42b04cea4018e5ddf239f64f Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qt3d b/qt3d index 2f8c7dd6..8b122b9b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2f8c7dd69c9d234b03ea0262e5246ceaaaa444db +Subproject commit 8b122b9b53687285953140b2130be6541a938737 diff --git a/qtbase b/qtbase index 8f8eb999..7cec3757 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8f8eb99991216c0833c23a0f068e036a70e3b060 +Subproject commit 7cec37572a8231b53fc64254bc874de599bc3af5 diff --git a/qtconnectivity b/qtconnectivity index 531443d1..35fe7d45 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 531443d1f00c0ebc6a56ebc30e5eea85b318b73e +Subproject commit 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e diff --git a/qtdeclarative b/qtdeclarative index 6381f6c8..4482aa57 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6381f6c87ff3eb3e15ba62f58a5393ce9026b99f +Subproject commit 4482aa576b2e0e6f5b30675d2681599daaf23762 diff --git a/qtmultimedia b/qtmultimedia index 19477de8..6a7d1bd6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 19477de84a64f412bca9ce2df62ab9adb3859da2 +Subproject commit 6a7d1bd6acbe7bfa9bdab8c5d2e96216bc73ce69 diff --git a/qtpurchasing b/qtpurchasing index 0fd1c541..6ec39500 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0fd1c5413bd433755e54c7d69493efc45c432764 +Subproject commit 6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00 diff --git a/qtqa b/qtqa index 25a39da9..0a7b4f9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25a39da9b7bacebc29ee5ffa688fa4953a6ab3dd +Subproject commit 0a7b4f9f2fa89020f3525a4387eaa848493b4f60 diff --git a/qtquick3d b/qtquick3d index e3aa1c6a..a77e066c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e3aa1c6a7c12c4c38ba28d0ae6ba91adfe3b07c7 +Subproject commit a77e066c15472dafa238c65e42c251592f61af0c diff --git a/qtquickcontrols b/qtquickcontrols index d286adc5..eb554a20 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d286adc5c7c27fdbbb7887f3a77212a49726cede +Subproject commit eb554a20ec5c48643784ce7b29f97ccfb31e7f89 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 32cbd755..6cdd4b53 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 32cbd7556dfbf4deb20c704b8ac6a481ddd047ae +Subproject commit 6cdd4b53031de17b36b30b00de0a6945470a35ad diff --git a/qtquicktimeline b/qtquicktimeline index 649afa13..973e5e6d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 649afa13b841cdf8339cfb605ef2ecba81768846 +Subproject commit 973e5e6da27cee94d95ed05cc4251c70381e9ad9 diff --git a/qtremoteobjects b/qtremoteobjects index 09838389..15e437e8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 09838389f3b9eaf67ad2e0b02a85a62a63fbfc38 +Subproject commit 15e437e870279937b15674c32783c776512ca20d diff --git a/qtrepotools b/qtrepotools index 7fc65858..fbe6d232 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7fc65858bf56ba4533ab3ef391adb63334d9dd98 +Subproject commit fbe6d232ba331f08c154465da64a2d2560774427 diff --git a/qtscxml b/qtscxml index 61ed1a9e..85ef74c2 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 61ed1a9e09fe54b0d52afbf865de03c8c4eaed82 +Subproject commit 85ef74c296716081b044db5fd9db4692443c229f diff --git a/qtsensors b/qtsensors index 53ce60e9..3c7ddeee 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 53ce60e9f9bf8a6c6b6f1c293564998b431987be +Subproject commit 3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837 diff --git a/qtserialbus b/qtserialbus index 8b1a6de7..3653815f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8b1a6de795523156a5a74dd2a544d866a8beeb53 +Subproject commit 3653815f3cd12291790180456fe18df9e95f82ab diff --git a/qtsvg b/qtsvg index 215a6642..8dbfbe63 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 215a6642a48b1272a54ce2d125346fa0b8c89847 +Subproject commit 8dbfbe633ee7cd1853354830872fc1c60f9e2139 diff --git a/qttools b/qttools index 3dc4d2a3..98a4e429 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3dc4d2a3b22eefa11ac1b8a3a908b0a6721ed3d9 +Subproject commit 98a4e4291da098b19a4a60fa8dbfcbdfa3b6a123 diff --git a/qtwayland b/qtwayland index 9bea5d5c..f195b7db 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9bea5d5cb8f48bd5602e1a45cf8817f7e5f320c8 +Subproject commit f195b7db8a206a6aad7734db24d611b8f9594aa1 diff --git a/qtwebengine b/qtwebengine index 18df1a7b..5d9b86df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 18df1a7b9282c42ee862403c4523a40e2321c458 +Subproject commit 5d9b86dff687621cad7cd1a9075d35fc49ed96e1 diff --git a/qtwebsockets b/qtwebsockets index 5bc1a1f8..ad75d271 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 +Subproject commit ad75d2712a838787488e817eec318fc27bae1786 diff --git a/qtwebview b/qtwebview index 3de65bf9..04b52921 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3de65bf9daf1d0e61300cdfe44d3eca51636d438 +Subproject commit 04b529214db0f20cce4d229a6035825390048217 -- cgit v1.2.3 From 10e843566e6a2b8c4354d677c5288802337dfae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Thu, 20 Feb 2020 00:01:03 +0100 Subject: Provisioning: Bump Emscripten version to 1.39.8 The upstream URLs have changed: - emscripten packages now at github.com/emscripten-core/emscripten/archive/ - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/ Add support for unpacking tbz2 files. Keep caching as before, update .emscripten config file with new paths. Task-number: QTQAINFRA-3577 Change-Id: I53e72f19d3eefa0e2155493db4f93c8730c60334 Reviewed-by: Lorn Potter --- .../unix/InstallFromCompressedFileFromURL.sh | 3 ++ coin/provisioning/common/unix/emsdk.sh | 60 ++++++++++------------ 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index 34bcf289..8aaa0dc3 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -67,6 +67,9 @@ function InstallFromCompressedFileFromURL { "xz") tar -xf "$targetFile" --directory "$targetDirectory" ;; + "tbz2") + tar -xjf "$targetFile" --directory "$targetDirectory" + ;; *) exit 1 ;; diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index acb2483a..a2fda735 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -39,59 +39,55 @@ 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" +version="1.39.8" 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" +# cross-platform emscripten SDK +urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz" +urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz" +sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f" +# platform-specific toolchain and node binaries. urls obtained from "emsdk install" 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" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2" + sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz" + urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz" + sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43" + pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node' 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" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2" + sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz" + urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz" + sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa" + pathNodeExecutable='node-v12.9.1-linux-x64/bin/node' fi sudo mkdir "$targetFolder" InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$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 = '' +LLVM_ROOT='$targetFolder/install/bin' +BINARYEN_ROOT='$targetFolder/install' +NODE_JS='$targetFolder/$pathNodeExecutable' TEMP_DIR = '/tmp' -COMPILER_ENGINE = NODE_JS -JS_ENGINES = [NODE_JS] EOM -SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\"" +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" echo "Emsdk = $version" >> ~/versions.txt -echo "Emsdk node = $version_node" >> ~/versions.txt -- cgit v1.2.3 From 08c21b092d2047822caccbb7322acbbdbc2a69f7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Mar 2020 05:30:53 +0000 Subject: Update submodules on '5.14.2' in qt5 Change-Id: I4ac85047efe6589405a96ceb9bcf42b9ef79b2d1 Reviewed-by: Jani Heikkinen --- 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 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 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 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index 8b34a40c..ea698681 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8b34a40c2c8e7468633555268cb1bea921e85a75 +Subproject commit ea698681d9669089cd7438d2690363cb5c690fd2 diff --git a/qtactiveqt b/qtactiveqt index 6ae4d9b3..2e9fca11 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6ae4d9b39285d84dad731893444f7027945900fb +Subproject commit 2e9fca11ba9c50bd0f80853d33ac6314d9942dfd diff --git a/qtandroidextras b/qtandroidextras index 2f0a5a41..da3032d6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2f0a5a4192fd8ca6d00391c6307973805d23a2f2 +Subproject commit da3032d612e8afe74b695d9b682d2cbc04a9b782 diff --git a/qtbase b/qtbase index c1bb6285..ddd0919b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c1bb6285720513b9b22b552ca30af3c1501a7761 +Subproject commit ddd0919bcf5bb630efce755cc21f364e36e23fca diff --git a/qtcharts b/qtcharts index 5d0f4509..0dbc3485 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d0f4509012b9512e55f0a2483440d81bf32502c +Subproject commit 0dbc3485d061d27df19c33e2f3fb3abd31bfd0bb diff --git a/qtdatavis3d b/qtdatavis3d index b255d892..1e5f5525 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b255d8923ba5eb8435485c1fab3f8d563ac4837c +Subproject commit 1e5f5525cf811bb0ffca3de389794fa10d2c1af2 diff --git a/qtdeclarative b/qtdeclarative index 2bb382f9..b67264a2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2bb382f9c276a1dc1258148c156222be3576aff5 +Subproject commit b67264a2644b22dc23f6a06ff48974c77cb45d84 diff --git a/qtdoc b/qtdoc index e97e5fc3..b79744a3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e97e5fc31e55683e93f5a76638c229d6c9d42b0a +Subproject commit b79744a3e637257bf483022e83e38e8f4b22bbf4 diff --git a/qtgamepad b/qtgamepad index e936e2bf..4ea44682 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e936e2bf84104668331d7f45d78d22ba190d6fba +Subproject commit 4ea446824de0d3a1bf098c55c28a3440c88ef99c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index aca14b54..337fec3f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit aca14b548477a00028a99d8acf184ec5c6403d95 +Subproject commit 337fec3f07fc8c88092b1cdff23cd85c6c3b127b diff --git a/qtimageformats b/qtimageformats index 0c4d4dc1..42486a31 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0c4d4dc12a68124451113e21d2c4fdc5d06d01d0 +Subproject commit 42486a317119a2df9e25df5b7e548eb61b020607 diff --git a/qtmacextras b/qtmacextras index 8245e27d..401b2514 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8245e27d9b5e395ddfeebda39cef2b5e1b8c8d51 +Subproject commit 401b251487469ed871c31b584ef30b0fcf7f6915 diff --git a/qtmultimedia b/qtmultimedia index bc42a549..7f0a20ad 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bc42a549a309603ab4afe28b87406a663702aa24 +Subproject commit 7f0a20ad066020d913faff636b8a0c5f61d2dfe0 diff --git a/qtnetworkauth b/qtnetworkauth index 5e31c8a6..9f3cdb9e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5e31c8a64073a3d2d88c23f211f22e719ffcd8a0 +Subproject commit 9f3cdb9e3ece4194af1b374dfde67ce807934325 diff --git a/qtpurchasing b/qtpurchasing index 35dfb472..9ccef69a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 35dfb472d44bad657b6636221c965bef67d861c2 +Subproject commit 9ccef69aa67cae578e6725680aa530d3e29fe047 diff --git a/qtquickcontrols b/qtquickcontrols index caecffab..8c3882d9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit caecffab98cb2c47140579712e5b7bc7f7ce3070 +Subproject commit 8c3882d9391968727c046344e456d1ab2f7b8e08 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 09476c59..bb2b1adf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 09476c590ab13623130d5ac79045fa68e504be96 +Subproject commit bb2b1adffe986843a6e7554bfe5ed26858c66264 diff --git a/qtquicktimeline b/qtquicktimeline index 7f05ba00..0df4b2cd 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7f05ba0039134598dffa17c2ef3e234b5e27241a +Subproject commit 0df4b2cd85b5d443675c38eb2c55ea6ea12b9174 diff --git a/qtscript b/qtscript index bfaadab3..bdf42faf 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit bfaadab30cb804204e90498437c360b037cc0b8d +Subproject commit bdf42faf19518cf2aceca74f91ab003d204d11be diff --git a/qtscxml b/qtscxml index dc27453a..fc0eecb7 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dc27453a24ef18082f6f39dcf835092d0d32f913 +Subproject commit fc0eecb79325713d3576a9d4a7eb359ef90bf3d9 diff --git a/qtsensors b/qtsensors index c9e6509d..92e19711 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c9e6509d3b1191831e6f4c4cd41aa283f6dfe583 +Subproject commit 92e19711f9170f26829498787d0e5de4889c9718 diff --git a/qtserialbus b/qtserialbus index 275ed191..4a0bdbfb 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 275ed191e6452d7e623cff0cde0beb9e416a8e46 +Subproject commit 4a0bdbfb757d98b7c95ce7a0c299ab19866529e6 diff --git a/qtserialport b/qtserialport index 553b62ba..30807cad 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 553b62badf129ab36c1beee844a9b39492479e34 +Subproject commit 30807cadfc8e40097ee6450f667c4510f925bcd2 diff --git a/qtspeech b/qtspeech index c47161c6..fa72efc2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c47161c6c4c4b1d3252faf7f3088b526ba783513 +Subproject commit fa72efc2acf18f7dd978fbef509b78f382172413 diff --git a/qtsvg b/qtsvg index 45530ad4..63961dd0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 45530ad4c5c6d3e90fe6d5a63f3bb551f37ad917 +Subproject commit 63961dd0c73fb6bf7de1b4d3e68fe5d24625a330 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cef398f8..bc84e924 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cef398f8c2176294dc492d7257c2b3705ec5a6ea +Subproject commit bc84e924a2da7ab515900355dcda968d56d1644e diff --git a/qtwayland b/qtwayland index 0f0fbf0a..3e79280a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0f0fbf0a70940379a99618d2069721471e3fc631 +Subproject commit 3e79280ad234ad01c126f84ecfa1596fa12628a0 diff --git a/qtwebchannel b/qtwebchannel index 9f056f79..d2c16a3e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9f056f7902350106d992d43cb04a9e2f6b6b299b +Subproject commit d2c16a3e7e090c667dbbd409e35df29b498914e0 diff --git a/qtwebengine b/qtwebengine index 9377855e..8ab924b7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9377855eb7c2310951d67e0fe5454be35fefd72c +Subproject commit 8ab924b7f735ba25a2b8ea40d16e997464d87378 diff --git a/qtwebglplugin b/qtwebglplugin index 4ec76380..55c7e18b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4ec76380e83b86a9202c4b24a1dc3452eedd937b +Subproject commit 55c7e18b7be32a6911631f32d4bfb9029c6ad689 diff --git a/qtwebsockets b/qtwebsockets index 9d3eb184..13c3b3ed 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9d3eb184c72333a95ee8f9ee33bd51942271de64 +Subproject commit 13c3b3edc5ce65ae65d7ed13cd4484a26fc74188 diff --git a/qtwebview b/qtwebview index 12420abb..9f479ce7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 12420abbfa66e03938571528647be6f6d9034aa7 +Subproject commit 9f479ce719c03035d93323322e646dca79b9dc39 diff --git a/qtwinextras b/qtwinextras index 0d5ce87e..92ad8a2a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0d5ce87e1aeaed361c8d034e8329c0ceca62e42a +Subproject commit 92ad8a2a852235c53cdf8e776513959f87c2e54b diff --git a/qtx11extras b/qtx11extras index 57910a80..fbed3bc3 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 57910a8015e05328a9ad412b4d76cc2137a853f3 +Subproject commit fbed3bc300461823960cfbcb2e1efa80da083b28 diff --git a/qtxmlpatterns b/qtxmlpatterns index 95b629b3..45bf7119 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 95b629b30380be3de92158ad55ba266452d3c945 +Subproject commit 45bf71199c6a5f3c070cad52435ac203c6cd480a -- cgit v1.2.3 From da2fcb295853e065be15d6c3acf9b65581854cdf Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 17 Mar 2020 07:06:00 +0200 Subject: Update qtwebengine Task-number: QTBUG-82894 Change-Id: I40cb18037a10cbf4205d6c2a6fbbefbcc259bc91 Reviewed-by: Antti Kokko --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 5d9b86df..0e59294a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5d9b86dff687621cad7cd1a9075d35fc49ed96e1 +Subproject commit 0e59294a0f88ba167dad4279372021841f51c82e -- cgit v1.2.3 From ee12ff98814dfa1297d25a8c1541ab77c17a6ec1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Mar 2020 06:18:02 +0000 Subject: Update submodules on '5.15' in qt/qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib79d685a5235bf1963b04ada786295221a83b1ca Reviewed-by: Tony Sarajärvi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtxmlpatterns | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 8b122b9b..afc0e80a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8b122b9b53687285953140b2130be6541a938737 +Subproject commit afc0e80a2b91603b31c407b5e03029dca557498f diff --git a/qtactiveqt b/qtactiveqt index 34d89d9b..927a76c9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 34d89d9b72198f0e0f085d7445db5709a8a130b3 +Subproject commit 927a76c9246109f14b51bd9a3cf224d6f987e10d diff --git a/qtandroidextras b/qtandroidextras index f4d122b2..934bb1fb 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f4d122b2912e7bc13c9e076a32a6b5c080aa4825 +Subproject commit 934bb1fba36ba9272a99be87bde72daf31de37d5 diff --git a/qtbase b/qtbase index 7cec3757..943cb099 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7cec37572a8231b53fc64254bc874de599bc3af5 +Subproject commit 943cb0999dbbf1da99c1358b81ea3298ee116447 diff --git a/qtdeclarative b/qtdeclarative index 4482aa57..869efe4a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4482aa576b2e0e6f5b30675d2681599daaf23762 +Subproject commit 869efe4a49c5286493d7f039325992725bcac6c3 diff --git a/qtdoc b/qtdoc index 1c236912..d17f1b97 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1c2369121e1c2a3b81c14ddb1fdd38061289abae +Subproject commit d17f1b97c1a78ab7bd7aedf2dd31bd1f004981bd diff --git a/qtmultimedia b/qtmultimedia index 6a7d1bd6..69837e6e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6a7d1bd6acbe7bfa9bdab8c5d2e96216bc73ce69 +Subproject commit 69837e6e04ae125186a8deaac59d82607fcd6d1a diff --git a/qtqa b/qtqa index 0a7b4f9f..c5a89ebb 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0a7b4f9f2fa89020f3525a4387eaa848493b4f60 +Subproject commit c5a89ebb30afe1066bb4b7d7783d8059282df81b diff --git a/qtquick3d b/qtquick3d index a77e066c..bdc2d90b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a77e066c15472dafa238c65e42c251592f61af0c +Subproject commit bdc2d90b9c0218caf69b0016c6f6aa8563cf07dc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6cdd4b53..9bfe2ad5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6cdd4b53031de17b36b30b00de0a6945470a35ad +Subproject commit 9bfe2ad59977e6bcde18e03d7cb32ac701d6e883 diff --git a/qttools b/qttools index 98a4e429..b98a4400 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 98a4e4291da098b19a4a60fa8dbfcbdfa3b6a123 +Subproject commit b98a44004d3d531207f5941a96f4af1c18eb42d6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 95be4f1e..b2624d70 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 95be4f1e3945f88adc9d55fa06371665254a1127 +Subproject commit b2624d70e91c5e28740da4a0a9360d7a5b426b96 diff --git a/qtxmlpatterns b/qtxmlpatterns index 837fe162..50cc72f9 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 837fe1627fce599bfb9a906d33d14df34648ba89 +Subproject commit 50cc72f9d47e754547e6ac81b90cfa13b7470381 -- cgit v1.2.3 From 939c0140394f180f608cfea42baf11502dba78f6 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 3 Mar 2020 15:12:58 +1000 Subject: Provisioning: Bump emscripten version to 1.39.8 on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3577 Change-Id: I63b06a8ac0b4a7233ed9031c7354f3b355c9f8ad Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/windows/emsdk.ps1 | 61 ++++++++++++++++-------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index 2ce2754f..b3375d07 100755 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -35,33 +35,38 @@ # This script will install emscripten needed by WebAssembly -$version = "1.38.27" -$versionNode = "8.9.1" -$versionWinPython = "2.7.13" +$version = "1.39.8" +$versionNode = "12.9.1" +$versionWinPython = "3.7.4" $versionJre = "8_update_152" -$urlOfficialMozilla = "https://s3.amazonaws.com/mozilla-games/emscripten/packages" +$urlEmscripten = "https://storage.googleapis.com/webassembly/emscripten-releases-builds" + +# cross-platform emscripten SDK +$urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.zip" $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" +$urlEmscriptenCache="$urlCache/emscripten.$version.zip" + +$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip" +$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip" +$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603" -$urlOfficialNode = "$urlOfficialMozilla/node-v$versionNode-win-x64.zip" +$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip" $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip" -$sha1Node = "249c840f7b953e4cb7ac9db89aa92a98daa1dc63" +$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D" -$urlOfficialWinPython = "$urlOfficialMozilla/WinPython-64bit-$versionWinPython.1Zero.zip" -$urlCacheWinPython = "$urlCache/windows/WinPython-64bit-$versionWinPython.1Zero.zip" -$sha1WinPython = "7e5a021878e0165ba0603e995b013e244d6e10cb" +$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip" +$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip" +$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104" -$urlOfficialProtableJre = "$urlOfficialMozilla/portable_jre_${versionJre}_64bit.zip" +$urlOfficialProtableJre = "$urlEmscripten/deps/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" +$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE" $installLocationEmsdk = "C:\\Utils\\emsdk" $temp = "C:\Windows\Temp" @@ -84,35 +89,33 @@ function Install { New-Item -ItemType directory -Force -Path "$installLocationEmsdk" -Install $urlOfficialEmscriptenLlvm $urlCacheEmscriptenLlvm $sha1EmscriptenLlvm "$temp\emscripten-llvm-e$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" +Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\wasm-binaries.$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 $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched" 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 +"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII +"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII +"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII +"JAVA='$installLocationEmsdk\\Java64'" | 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_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin" +Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\" 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_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\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" +Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten" +Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin" Write-Output "emsdk = $version" >> ~/versions.txt Write-Output "emsdk llvm = $version" >> ~/versions.txt -- cgit v1.2.3 From 79e164fc720cf0682ecfbf46a157841dccfef7db Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 20 Mar 2020 06:57:48 +0000 Subject: Update submodules on '5.14.2' in qt5 Change-Id: I4ba4dfe103d1875b04507f463e780db680d1e17a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index ddd0919b..1a18e138 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ddd0919bcf5bb630efce755cc21f364e36e23fca +Subproject commit 1a18e138f4d17c219c6ffd6e4396c30b960818b4 diff --git a/qtconnectivity b/qtconnectivity index 58e0224a..b445ea4f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 58e0224a6677667b1102b34ad5b35a787bd74077 +Subproject commit b445ea4ff203fbcb5011adae0236dd028f11bc89 diff --git a/qtdeclarative b/qtdeclarative index b67264a2..23a000f9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b67264a2644b22dc23f6a06ff48974c77cb45d84 +Subproject commit 23a000f9a14889753a63cd73de2c61e49bb7e0d8 diff --git a/qtdoc b/qtdoc index b79744a3..4e8f8dc3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b79744a3e637257bf483022e83e38e8f4b22bbf4 +Subproject commit 4e8f8dc3e09c1ab8600b1997c5a5df328d74d276 diff --git a/qtlocation b/qtlocation index 07de1d0f..feb604c3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07de1d0f0f93b742434e2fcfda70bf70cb6373c9 +Subproject commit feb604c32611183083855c04b07c6be1e0efc9c6 diff --git a/qtmultimedia b/qtmultimedia index 7f0a20ad..c012f0a7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7f0a20ad066020d913faff636b8a0c5f61d2dfe0 +Subproject commit c012f0a727144714f9480e98938ca8eb2137c213 diff --git a/qtqa b/qtqa index 0a7b4f9f..5ed66584 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0a7b4f9f2fa89020f3525a4387eaa848493b4f60 +Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 diff --git a/qtquick3d b/qtquick3d index 2c425cf3..a0197a18 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2c425cf308188a0b3fc3f288ee71934a4ed4da40 +Subproject commit a0197a18cebfb718c1787fcd8779bcf237f97137 diff --git a/qtremoteobjects b/qtremoteobjects index 14daacff..c6423728 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 14daacff9654980381a1d0b7b09d0b25f6c9dbb2 +Subproject commit c64237289a6287c23564827b51092e58a1e6cbac diff --git a/qttools b/qttools index d482bfef..9d5d92a4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d482bfef233be2aea221533dd0c4bd695875fad7 +Subproject commit 9d5d92a49256af65a85fa69b58e6744c2722321b diff --git a/qtwebengine b/qtwebengine index 8ab924b7..540451ab 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8ab924b7f735ba25a2b8ea40d16e997464d87378 +Subproject commit 540451ab9a7e8e9f85078b4cebcc7f619a8b6322 -- cgit v1.2.3 From 58f832445889d7745fba22f7ca9489b209df7151 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 17 Mar 2020 10:53:20 +0100 Subject: Do not pass -qt-zlib to cross-builds Commit 89fceff6a4d added -qt-zlib to all Windows configure lines. This also affected QNX. Instead, only pass -qt-zlib to native builds. Fixes: QTBUG-82254 Change-Id: I116cae82ab971170e633b5a8602dd573407be96f Reviewed-by: Joerg Bornemann --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qt5.yaml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1206bf14..91a5fde8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -33,14 +33,14 @@ Configurations: Target arch: 'x86' Compiler: 'MSVC2015' 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 -qt-zlib' + 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-16' 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 -qt-zlib' + 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-16' Compiler: 'MSVC2017' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 89adc43e..8bbef9d8 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -3,14 +3,14 @@ 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 -qt-zlib' + 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-16' 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 -qt-zlib' + 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' @@ -27,13 +27,13 @@ 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 -qt-zlib' + 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-16' 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 -qt-zlib' + 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-windows-10-x86_64-16' Target os: 'Android_ANY' @@ -41,7 +41,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-r20 -qt-zlib' + 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' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -63,21 +63,21 @@ Target arch: 'armv7' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -extprefix 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-16' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -extprefix 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-16' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -extprefix 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.6-x86_64' Target os: 'QNX_700' @@ -97,7 +97,7 @@ Target os: 'WebAssembly' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-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 -qt-zlib' + Configure arguments: '-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' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'WebAssembly' -- cgit v1.2.3 From e90ca63f9495b1308634bf826c61cebacd097e29 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Mar 2020 10:03:41 +0000 Subject: Update submodules on '5.14.2' in qt5 Change-Id: I8da2e10658ec25db0822eba56ccfe1e12b1868f9 Reviewed-by: Jani Heikkinen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 540451ab..98af3796 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 540451ab9a7e8e9f85078b4cebcc7f619a8b6322 +Subproject commit 98af37969ec9cfd4eaa28884ea6d21dfbe008764 -- cgit v1.2.3 From e514b5913a10306ea8362441aaef89e5cdc434fe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 20 Mar 2020 23:46:25 +0100 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: Id62752c7cfc871751d9320460bb2fdca55639d5e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index afc0e80a..e819e8d6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit afc0e80a2b91603b31c407b5e03029dca557498f +Subproject commit e819e8d654fb8d15d24961d56578025c6171610c diff --git a/qtbase b/qtbase index 943cb099..d41d8297 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 943cb0999dbbf1da99c1358b81ea3298ee116447 +Subproject commit d41d8297c8e74b8e4b684039c13e86b23cce11ea diff --git a/qtdeclarative b/qtdeclarative index 869efe4a..34a5567a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 869efe4a49c5286493d7f039325992725bcac6c3 +Subproject commit 34a5567ae6a109c7a0ce1cf65e5e1a6d8786881e diff --git a/qtdoc b/qtdoc index d17f1b97..dcfe75ec 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d17f1b97c1a78ab7bd7aedf2dd31bd1f004981bd +Subproject commit dcfe75ec675683f62ed36dfb5fa15ecc92ff7b0c diff --git a/qtmultimedia b/qtmultimedia index 69837e6e..8ef57db9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 69837e6e04ae125186a8deaac59d82607fcd6d1a +Subproject commit 8ef57db9729b714239ad507488e1c8a011a5163a diff --git a/qtqa b/qtqa index c5a89ebb..5ed66584 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c5a89ebb30afe1066bb4b7d7783d8059282df81b +Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 diff --git a/qtquick3d b/qtquick3d index bdc2d90b..3f4126c6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit bdc2d90b9c0218caf69b0016c6f6aa8563cf07dc +Subproject commit 3f4126c69f1dce122230f974e72432b7fa2468db diff --git a/qtquickcontrols b/qtquickcontrols index eb554a20..e9ad3352 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit eb554a20ec5c48643784ce7b29f97ccfb31e7f89 +Subproject commit e9ad3352df0815761c1fde8ea36b040e8431f360 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9bfe2ad5..418cb72b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9bfe2ad59977e6bcde18e03d7cb32ac701d6e883 +Subproject commit 418cb72b9346ddb258cb1384fd6b95af143c2059 diff --git a/qtserialbus b/qtserialbus index 3653815f..16817cba 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3653815f3cd12291790180456fe18df9e95f82ab +Subproject commit 16817cba8720797f20c6d8e638614356d909529b diff --git a/qtsvg b/qtsvg index 8dbfbe63..2c67415a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8dbfbe633ee7cd1853354830872fc1c60f9e2139 +Subproject commit 2c67415afc2e12bab958e16b18bcab88a537c248 diff --git a/qttools b/qttools index b98a4400..02265f9b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b98a44004d3d531207f5941a96f4af1c18eb42d6 +Subproject commit 02265f9bbc213d219afc345594307affb900e07e diff --git a/qttranslations b/qttranslations index fc73b5db..64adb8c0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fc73b5dbf6d7719dca652a1cf3aa71ba5d58f8ce +Subproject commit 64adb8c01d477cec0b8fe3e3903778eb0c71a620 diff --git a/qtwayland b/qtwayland index f195b7db..e2d2d7e0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f195b7db8a206a6aad7734db24d611b8f9594aa1 +Subproject commit e2d2d7e06ae4d054d75738038645126bce9092ad diff --git a/qtwebengine b/qtwebengine index 0e59294a..2ac49039 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0e59294a0f88ba167dad4279372021841f51c82e +Subproject commit 2ac4903962c9b7e25793d7bf3fdd084b0719d327 diff --git a/qtwebsockets b/qtwebsockets index ad75d271..ed93680f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ad75d2712a838787488e817eec318fc27bae1786 +Subproject commit ed93680f34e92ad0383aa4e610bb65689118ca93 -- cgit v1.2.3 From 2bf281229ae783821576c43542ddd2dac5b33e01 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Mar 2020 23:46:17 +0100 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I5a592a5d5d5fe83b710eee6d591dc60d0207c943 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtwebview | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index d41d8297..1e03015d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d41d8297c8e74b8e4b684039c13e86b23cce11ea +Subproject commit 1e03015d551fb1542d43f54f8b64cf721da51913 diff --git a/qtdoc b/qtdoc index dcfe75ec..752816a8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dcfe75ec675683f62ed36dfb5fa15ecc92ff7b0c +Subproject commit 752816a86f93c200d45d405df2f972d6eba9c23d diff --git a/qtlocation b/qtlocation index 0a074c71..a9b97694 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a074c7164f562417b2667c175d4e20d63415b48 +Subproject commit a9b976944740ba3fd8988e117cd101e48a2aef50 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 418cb72b..62c8ae30 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 418cb72b9346ddb258cb1384fd6b95af143c2059 +Subproject commit 62c8ae30880886f3ed17ddc17713db1a7410964e diff --git a/qtwebview b/qtwebview index 04b52921..c6d4bb78 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 04b529214db0f20cce4d229a6035825390048217 +Subproject commit c6d4bb78fe59a55ffce526ff951e5c5270dd92cf -- cgit v1.2.3 From f164974aef24f1b5eff64422e25aae740de62aaf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 22 Mar 2020 22:30:52 +0100 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I1b90e5a2092976a5c6e5ad6e0dffef1f365790c3 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 8b34a40c..68407862 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8b34a40c2c8e7468633555268cb1bea921e85a75 +Subproject commit 68407862766c514eb77270fdb5ab2890e74b59b3 diff --git a/qtbase b/qtbase index c1bb6285..cb509f3a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c1bb6285720513b9b22b552ca30af3c1501a7761 +Subproject commit cb509f3aeeea2a905b696f3914fa6d03c9106f71 diff --git a/qtdeclarative b/qtdeclarative index 2bb382f9..92fc8e4c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2bb382f9c276a1dc1258148c156222be3576aff5 +Subproject commit 92fc8e4cb82aaa0e2996e38d8e16317e5cb8f972 diff --git a/qtdoc b/qtdoc index e97e5fc3..9dbfb42c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e97e5fc31e55683e93f5a76638c229d6c9d42b0a +Subproject commit 9dbfb42c2176d6790c1be516df220426e35aa179 diff --git a/qtlocation b/qtlocation index 07de1d0f..a0e88ed1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07de1d0f0f93b742434e2fcfda70bf70cb6373c9 +Subproject commit a0e88ed10cd07d4bdf79d7e7f05f01179f2eb296 diff --git a/qtmultimedia b/qtmultimedia index bc42a549..42646fd2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bc42a549a309603ab4afe28b87406a663702aa24 +Subproject commit 42646fd2d1cfc03101cd1b14277b5462366fc2f7 diff --git a/qtqa b/qtqa index 0a7b4f9f..5ed66584 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0a7b4f9f2fa89020f3525a4387eaa848493b4f60 +Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 diff --git a/qtquickcontrols b/qtquickcontrols index caecffab..b26bfb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit caecffab98cb2c47140579712e5b7bc7f7ce3070 +Subproject commit b26bfb18616e2a4baf33f9f1a2c147e3f5512de6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 09476c59..ac9d427c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 09476c590ab13623130d5ac79045fa68e504be96 +Subproject commit ac9d427cd22e9b0c820dafd68ab17cca930c841d diff --git a/qtremoteobjects b/qtremoteobjects index 14daacff..58107720 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 14daacff9654980381a1d0b7b09d0b25f6c9dbb2 +Subproject commit 5810772025b1819ef2e5ff8c214d89baed1e6f0f diff --git a/qtsvg b/qtsvg index 45530ad4..92ae8746 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 45530ad4c5c6d3e90fe6d5a63f3bb551f37ad917 +Subproject commit 92ae8746c412fbc87a97364eb4d86e470009f80d diff --git a/qttools b/qttools index d482bfef..c35cd309 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d482bfef233be2aea221533dd0c4bd695875fad7 +Subproject commit c35cd309f480d76e44e3bd806c40f96f0384e576 diff --git a/qtwayland b/qtwayland index 0f0fbf0a..2e61283f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0f0fbf0a70940379a99618d2069721471e3fc631 +Subproject commit 2e61283f7999f3d518dfc421f1298ace59e833bd diff --git a/qtwebengine b/qtwebengine index 9377855e..9522dc8f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9377855eb7c2310951d67e0fe5454be35fefd72c +Subproject commit 9522dc8f71e189cf75eabdca4b3fab2d254d1542 diff --git a/qtwebview b/qtwebview index 12420abb..df93624c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 12420abbfa66e03938571528647be6f6d9034aa7 +Subproject commit df93624cc31e9da29532eed1d86c9f172575355a -- cgit v1.2.3 From 2b7355e69c44d52f8ef2e8367917217653f607b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 22 Oct 2019 10:34:44 +0000 Subject: Update MinGW 7.3.0 to Mingw 8.1.0 Task-number: QTQAINFRA-3304 Change-Id: I4a962c112f4925224e91c08117c7324112d70729 Reviewed-by: Qt CI Bot Reviewed-by: Cristian Adam Reviewed-by: BogDan Vatra --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qt5.yaml | 23 +++++++++++++++------- coin/platform_configs/qtsaferenderer.yaml | 8 ++++++-- coin/platform_configs/qtwebkit.yaml | 5 ++++- .../qtci-windows-10-x86_64/09-install-mingw810.ps1 | 11 +++++++++++ .../09-install-mingw810_64.ps1 | 10 ++++++++++ .../qtci-windows-7-x86/09-install-mingw810.ps1 | 11 +++++++++++ 7 files changed, 60 insertions(+), 12 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 096d2504..6ef67f56 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,5 +1,4 @@ Version: 2 -Module only: True Configurations: - Template: 'qtci-windows-10-x86_64-16' @@ -8,7 +7,8 @@ Configurations: 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% -qt-zlib' - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] 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++ -qt-zlib' - Template: 'qtci-windows-10-x86_64-16' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 2794179e..0dbb980c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,3 +1,5 @@ +Version: 2 +Configurations: - Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' @@ -13,12 +15,14 @@ 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-msvc2019 -xplatform winrt-x86-msvc2019 -qt-zlib' - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - @@ -38,7 +42,8 @@ Template: 'qtci-windows-10-x86_64-16' Target os: 'Android_ANY' Target arch: 'multi' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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-r20 -qt-zlib' @@ -61,21 +66,24 @@ Template: 'qtci-windows-10-x86_64-16' Target os: 'QNX_700' Target arch: 'armv7' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib' - Template: 'qtci-windows-10-x86_64-16' Target os: 'QNX_700' Target arch: 'armv8' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib' - Template: 'qtci-windows-10-x86_64-16' Target os: 'QNX_700' Target arch: 'x86_64' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qt-zlib' - @@ -95,7 +103,8 @@ - Template: 'qtci-windows-10-x86_64-16' Target os: 'WebAssembly' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-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 -qt-zlib' - diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 5844a186..322f1754 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,10 +1,14 @@ +Version: 2 +Configurations: - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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-16' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++' - diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 0a1d5d31..5661bd92 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,5 +1,8 @@ +Version: 2 +Configurations: - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -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++' diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 new file mode 100644 index 00000000..b712c2b3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 8.1.0 + +$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0" + +$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c" + +InstallMinGW $release $sha1 + diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + -- cgit v1.2.3 From bee6bf85d9128f9f344413fd12d65bbf1fe5985e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Mar 2020 23:46:38 +0100 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I5219e3ecc5c3dc4d7c5c396e423f376c7f488c5d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 1e03015d..34fe5f75 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1e03015d551fb1542d43f54f8b64cf721da51913 +Subproject commit 34fe5f75bcfd382b3928e221b5c9a002545fe3b9 diff --git a/qtdeclarative b/qtdeclarative index 34a5567a..861f53d6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 34a5567ae6a109c7a0ce1cf65e5e1a6d8786881e +Subproject commit 861f53d60cc2dd8bd8529c65863af881dbdd8db8 diff --git a/qtlocation b/qtlocation index a9b97694..ae9a8826 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a9b976944740ba3fd8988e117cd101e48a2aef50 +Subproject commit ae9a8826d73fa689e81c43038bb13226c9cb9ac7 diff --git a/qtmultimedia b/qtmultimedia index 8ef57db9..00ae18f9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8ef57db9729b714239ad507488e1c8a011a5163a +Subproject commit 00ae18f986cadc4c888625fb63b2ca89da1f986f diff --git a/qtnetworkauth b/qtnetworkauth index 1afc9939..72f5b40b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1afc99397bd35fc3cd24913f5dc10743de1833dc +Subproject commit 72f5b40b00178710b36edc7ed1769321182e7fa6 diff --git a/qtqa b/qtqa index 5ed66584..50020b4d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 +Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 diff --git a/qtquick3d b/qtquick3d index 3f4126c6..7d23aba8 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3f4126c69f1dce122230f974e72432b7fa2468db +Subproject commit 7d23aba8c2e6c19b2ed7ad91c3e27405c211c991 diff --git a/qtremoteobjects b/qtremoteobjects index 15e437e8..5c6df27b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 15e437e870279937b15674c32783c776512ca20d +Subproject commit 5c6df27b4f822cfe485154336f9143e261cb37b9 diff --git a/qtserialbus b/qtserialbus index 16817cba..1a893e24 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 16817cba8720797f20c6d8e638614356d909529b +Subproject commit 1a893e24a96d9a276b68f6ae9baee9f86f885d2c diff --git a/qtwebengine b/qtwebengine index 2ac49039..df241d15 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2ac4903962c9b7e25793d7bf3fdd084b0719d327 +Subproject commit df241d1585e2ef6be28e38182cdf7e562e9c1a8a diff --git a/qtwebsockets b/qtwebsockets index ed93680f..37203fab 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ed93680f34e92ad0383aa4e610bb65689118ca93 +Subproject commit 37203fab746060edaccea8abcddc181611ab0555 diff --git a/qtxmlpatterns b/qtxmlpatterns index 50cc72f9..5ca8c0bc 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 50cc72f9d47e754547e6ac81b90cfa13b7470381 +Subproject commit 5ca8c0bc4e7e2f3af9a8d91d00ad11329a7cab8a -- cgit v1.2.3 From 7264214147277b5aecc6986ac90dd241fa24df80 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Mar 2020 22:31:09 +0100 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: Ic3049794ed566ef0bb889d2312a358c07c0e4328 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index cb509f3a..cc1d891b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cb509f3aeeea2a905b696f3914fa6d03c9106f71 +Subproject commit cc1d891b8ed1c4f23183e4b06f46e5840a993e35 diff --git a/qtmultimedia b/qtmultimedia index 42646fd2..2a888bc3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 42646fd2d1cfc03101cd1b14277b5462366fc2f7 +Subproject commit 2a888bc3fb72069e735faad42e8325f60a5d7412 diff --git a/qtqa b/qtqa index 5ed66584..50020b4d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 +Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 -- cgit v1.2.3 From 2d524e4bcc2f4fdc85871bd9d00e613f8cf39015 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Mar 2020 05:01:43 +0000 Subject: Update submodules on '5.14.2' in qt/qt5 Change-Id: I6035e0ffe3afafe50b623637324c83e507bee771 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 1a18e138..bd78753d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1a18e138f4d17c219c6ffd6e4396c30b960818b4 +Subproject commit bd78753d625c573eef587fc0b8e767cffb99c2bf diff --git a/qtqa b/qtqa index 5ed66584..50020b4d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5ed665841c4b5dff6efe5d2fd2a3efce9f423dc2 +Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 diff --git a/qtwayland b/qtwayland index 3e79280a..af3976e5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3e79280ad234ad01c126f84ecfa1596fa12628a0 +Subproject commit af3976e5e788392ab2b0299c11036c18493d8d40 diff --git a/qtwebengine b/qtwebengine index 98af3796..35aa6c30 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 98af37969ec9cfd4eaa28884ea6d21dfbe008764 +Subproject commit 35aa6c30f0e766b8825519e04242b7a4c93b6e0e -- cgit v1.2.3 From 704e5d56357be28db10cdfdcbb1c80310893a30b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 11 Mar 2020 15:30:59 +0200 Subject: Update Windows 10 x86 to version 1909 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are also updated to tier1 image: msvc 2017: 15.9.21 msvc 2017 build tools: 15.0 (26228.10) msvc 2019: 16.4.6 msvc 2019 build tools: 16.4.6 Change-Id: I41ae0e287ccf74183438d7a7bff639fd78e86e7a Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtsdk.yaml | 2 +- coin/platform_configs/tqtc-qt-rta.yaml | 2 +- .../06-msvc_2017_build_tools.ps1 | 48 ------------ .../README_MANUAL_INSTALLATIONS | 47 +++++++++++ .../qtci-windows-10-x86/disable-defragment.ps1 | 72 +++++++++++++++++ .../qtci-windows-10-x86/disable-ntp.ps1 | 4 + .../qtci-windows-10-x86/disable-schedule-tasks.ps1 | 88 +++++++++++++++++++++ .../disable-update-orchestrator.ps1 | 16 ++++ .../qtci-windows-10-x86/disable-windefender.ps1 | 63 +++++++++++++++ .../disable-windows-file-protector.ps1 | 4 + .../disable-windows-update-medic.ps1 | 25 ++++++ .../disable-windows-updates.ps1 | 54 +++++++++++++ .../qtci-windows-10-x86/msvc2015_update.ps1 | 58 -------------- .../qtci-windows-10-x86/msvc2017.ps1 | 49 ------------ .../qtci-windows-10-x86/msvc2017.txt | 91 ++++++++++++++++++++++ .../qtci-windows-10-x86/msvc2017_build_tools.txt | 40 ++++++++++ .../qtci-windows-10-x86/msvc2019.txt | 69 ++++++++++++++++ .../qtci-windows-10-x86/00-disable-windefender.ps1 | 1 - .../01-disable-windows-updates.ps1 | 1 - .../qtci-windows-10-x86/02-disable-defragment.ps1 | 1 - .../qtci-windows-10-x86/02-disable-ntp.ps1 | 1 - 21 files changed, 575 insertions(+), 161 deletions(-) delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-schedule-tasks.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt delete mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml index 754e8492..75af86fd 100644 --- a/coin/platform_configs/qtsdk.yaml +++ b/coin/platform_configs/qtsdk.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86-3' + Template: 'qtci-windows-10-x86-4' Compiler: 'MSVC2017' Configure arguments: '-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 index 76664d06..1bf9cf9e 100644 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -9,6 +9,6 @@ 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' + Template: 'qtci-windows-10-x86-4' Compiler: 'MSVC2017' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 deleted file mode 100644 index 2bb92c22..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 Build Tools -# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 - -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000..0099b600 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS @@ -0,0 +1,47 @@ +CPU 4G +Memory: 4G +Hard disk: 250G +Network: CI_NW +Video Card - total memory: 32MB + +VM Options: +Boot options/Firmware: BIOS + +Language: English US +Time and currency format: Finnish (Finland) +Keyboard: Finnish +Windows 10 Enterprise +Region: Finland +Default keyboard layout: English (United States) + +* VMware tools (complete) installed +* Resolution set to 1280x800 +* Coin-setup: + - Installing Boostrap agent + - Disabling fast boot + - Disabling firewall + - Disabling UAC + - Enabling autologin + - Automatic login + - Disabling windows updates +* Enable 'Allow remote connections to this computer' +* Windows Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' + - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' * Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" * Background defrag disabled: 'defragment + NOTE! Without this step windows defender can't be disabled! +* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" + - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"' +* Time zone: Coordinated Universal Time +* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable +* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable +* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never' +* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support +* Google Chrome installed for RTA +* Turn off Virus & threat protection (all sections) manually. Without this step windows defender can't be disabled! + - Real-tiem protection -> off + - Cloud-delivered protection -> off + - Automatic sample submission -> off + - Tamper protection -> off +* Activate Windows +* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs' + - Add feature 'Debugging Tools for Windows' +* REBOOT the VM diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 new file mode 100644 index 00000000..e76f0649 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 @@ -0,0 +1,72 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 new file mode 100644 index 00000000..22651763 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 @@ -0,0 +1,4 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# Disable the NTP from syncing +Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-schedule-tasks.ps1 new file mode 100644 index 00000000..1febd88c --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-schedule-tasks.ps1 @@ -0,0 +1,88 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# This script will remove unneeded Tasks from Task Scheduler + +# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser" + +# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program" +DisableSchedulerTask "Application Experience\ProgramDataUpdater" + +# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Autochk\Proxy" + +# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan" +DisableSchedulerTask "Chkdsk\ProactiveScan" + +# Chkdsk 'SyspartRepair' +DeleteSchedulerTask "Chkdsk\SyspartRepair" + +# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft." +DisableSchedulerTask "Customer Experience Improvement Program\Consolidator" + +# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything." +DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip" + +# Device Information 'Device' +DisableSchedulerTask "Device Information\Device" + +# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance." +DisableSchedulerTask "Diagnosis\Scheduled" + +# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program." +DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" + +# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings." +DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh" + +# Feedback/Siuf 'DmClient' +DisableSchedulerTask "Feedback\Siuf\DmClient" + +# Feedback/Siuf 'DmClient'OnScenarioDownload' +DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload" + +# File Classification Infrastructure 'Property Definition Sync' +DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync" + +# InstallService 'ScanForUpdates' +DisableSchedulerTask "InstallService\ScanForUpdates" + +# InstallService 'ScanForUpdatesAsUser' +DisableSchedulerTask "InstallService\ScanForUpdatesAsUser" + +# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\Installation" + +# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources" + +# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables." +DisableSchedulerTask "PI\Secure-Boot-Update" + +# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot." +DisableSchedulerTask "PI\Sqm-Tasks" + +# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use." +DisableSchedulerTask "PushToInstall\Registration" + +# Servicing 'StartComponentCleanup' +DisableSchedulerTask "Servicing\StartComponentCleanup" + +# SettingSync 'BackgroundUploadTask' +DeleteSchedulerTask "SettingSync\BackgroundUploadTask" + +# SoftwareProtectionPlatform 'SvcRestartTask' - "This task restarts the Software Protection Platform service at the specified time" +DeleteSchedulerTask "SoftwareProtectionPlatform\SvcRestartTask" + +# SoftwareProtectionPlatform 'SvcRestartTaskLogon' - "This task restarts the Software Protection Platform service at the specified time" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskLogon" + +# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" + +# UNP 'RunUpdateNotificationMgr' +DeleteSchedulerTask "UNP\RunUpdateNotificationMgr" + + + + diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 new file mode 100644 index 00000000..5ae8fb0d --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 @@ -0,0 +1,16 @@ +# Disable UpdateOrchestrator + +$name = "UpdateOrchestrator" +$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" + +takeown /F $path /A /R +icacls $path /grant Administrators:F /T +SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE +del "$path\Schedule Scan" +del "$path\Schedule Scan Static Task" +del "$path\Backup Scan" +del "$path\UpdateModelTask" +del "$path\USO_UxBroker" + +# Disable Update orchestrator service +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 new file mode 100644 index 00000000..47e913d5 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 @@ -0,0 +1,63 @@ +########################################################################### +## +## 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$ +## +############################################################################# + +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +# NOTE! Windows Defender Antivirus needs to be turned off! +# Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' +# Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' + + +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" + +# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." +DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" + +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" + +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" + +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 new file mode 100644 index 00000000..f1d09fb5 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 @@ -0,0 +1,4 @@ +# Disable Windows File Protection +# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files. + +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 new file mode 100644 index 00000000..6accbd3b --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 new file mode 100644 index 00000000..87414f03 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 @@ -0,0 +1,54 @@ +############################################################################ +## +## 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 disables the automatic Windows updates + +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + Stop-Service -Name "wuauserv" -Force +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 deleted file mode 100644 index 35f8dc3f..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# -. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" - -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" - -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" - -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" - -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 deleted file mode 100644 index 052ec9c6..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 - -$version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" - - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt new file mode 100644 index 00000000..7b834a4c --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt @@ -0,0 +1,91 @@ +############################################################################ +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# Visual Studio $version version $version_number was installed manually using $installer. + +$version = "2017" +# Current version was manually upgraded from the installer +$version_number = "15.9.21" +$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__1312218103.1526017942.exe" + +# Following components were selected from installer: +# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) +# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) +# Microsoft.Component.NetFX.Native (.NET Native) +# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) +# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) +# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) +# Microsoft.Component.ClickOnce (ClickOnce Publishing) +# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) +# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) +# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) +# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) +# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) +# Microsoft.Component.MSBuild (MSBuild) +# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.9 v14.16 latest v141 tools) +# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) +# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) +# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) +# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) +# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) +# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) +# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) +# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) +# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) +# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) +# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) +# Component.Linux.CMake (Visual C++ tools for CMake and Linux) +# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) +# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) +# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) +# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) +# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) +# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) +# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.1 SDK) +# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) +# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) +# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) + +# NOTE! Work loads were added during installation! + +echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt new file mode 100644 index 00000000..42cbb707 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt @@ -0,0 +1,40 @@ +############################################################################ +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Visual Studio 2017 Build Tools +# Install both build tools: Visual C++ and Web development +# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 + +$url_internal = https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt new file mode 100644 index 00000000..d8767a96 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt @@ -0,0 +1,69 @@ +# Visual Studio $version version $version_number was installed manually using $installer. + +$version = "2019" +# Current version was manually upgraded from the installer +$version_number = "16.4.6" +$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe" + +MSVC 2019 build tools (default installation, no additional selections). + * Install after MSVC2019 is installed! + * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" + * Version: 16.4.6 + +Installed MSVC-2019 Components: + +.NET Framework 4.5 targeting pack +.NET Framework 4.5.1 targeting pack +.NET Framework 4.5.2 targeting pack +.NET Framework 4.6.1 SDK +.NET Framework 4.6.1 targeting pack +.NET Framework 4.6.2 SDK +.NET Framework 4.6.2 targeting pack +.NET Framework 4.7.2 SDK +.NET Framework 4.7.2 targeting pack +.NET Framework 4.8 SDK +.NET Framework 4.8 targeting pack +.NET Native +.NET Portable Library targeting pack +CLR data typer for SQL Sever +Connectivity and publishing tools +Data sources for SQL Server support +SQL ADAL runtime +SQL Server Command Linne Utilities +SQL Server Data Tools +SQL Server Express 2016 LocalDB +SQL Server ODBC Driver +ClickOnce Publishing +Developer Analytics tools +NuGet package manager +Text Template Transformation +C# and Visual Basic Roslyn compilers +C++ 2019 Redistributable Update +C++ Cmake tools for Windows +C++/CLI support for v142 build tools /14.24) +MSBuild +MSVC v142 - VS 2019 C++ ARM build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM build tools (v14.24) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24) +.NET profiling tools +C++ profiling tools +JavaScript diagnostics +Just-In-Time debugger +C# and Visual Basic +C++ core features +JavaSript and TypeScript language support +Razor Language Services +Graphics debugger and GPU profiler for DirectX +Image and 3D model editors +C++ ATL for latest v142 build tools (x86 & x64) +TypeScript 3.7 SDK +Windows 10 SDK (10.0.16299.0) +Windows 10 SDK (10.0.17134.0) +Windows 10 SDK (10.0.17763.0) +Windows 10 SDK (10.0.18362.0) + +# NOTE! Work loads were added during installation! + diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 deleted file mode 100644 index 10518401..00000000 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" -- cgit v1.2.3 From 2e7ba38d18768d2a926bf78bf253fec71ba5fe15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Mar 2020 18:22:49 +0000 Subject: Update submodules on '5.14.2' in qt/qt5 Change-Id: Id700b8f69bc185d9a6fff4298409126c27b88448 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index bd78753d..3a6d8df5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd78753d625c573eef587fc0b8e767cffb99c2bf +Subproject commit 3a6d8df5219653b043bd642668cee193f563ec84 diff --git a/qtqa b/qtqa index 50020b4d..af377a33 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 +Subproject commit af377a33104ccaed85e15f8cc0069c6d35269ca8 -- cgit v1.2.3 From 5cf6725dbe2b2079786f16473d86adde37b77dfc Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 16 Mar 2020 13:35:35 +0200 Subject: Provisioning: Disable notifications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having notifications enabled will eat VM resources (CPU). Change-Id: I2af7fbc7afeb9436164915353998abf219d495ed Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86/01-disable-notifications.ps1 | 9 +++++++++ .../qtci-windows-10-x86_64/01-disable-notifications.ps1 | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 new file mode 100644 index 00000000..ada20147 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 @@ -0,0 +1,9 @@ +# Windows 'Notifications & actions' +# Disable 'Get notifications from apps and other senders' +reg.exe ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\PushNotifications" /V ToastEnabled /T REG_dWORD /D 0 /F + +# Disable 'Show me the Windows welcome experience after udpates and occasionally when I sign in to highlight what's new and suggested' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-310093Enabled /T REG_dWORD /D 0 /F + +# Disable 'Get tips, tricks and suggestions as you use Windows' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-338389Enabled /T REG_dWORD /D 0 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 new file mode 100644 index 00000000..ada20147 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 @@ -0,0 +1,9 @@ +# Windows 'Notifications & actions' +# Disable 'Get notifications from apps and other senders' +reg.exe ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\PushNotifications" /V ToastEnabled /T REG_dWORD /D 0 /F + +# Disable 'Show me the Windows welcome experience after udpates and occasionally when I sign in to highlight what's new and suggested' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-310093Enabled /T REG_dWORD /D 0 /F + +# Disable 'Get tips, tricks and suggestions as you use Windows' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-338389Enabled /T REG_dWORD /D 0 /F -- cgit v1.2.3 From 5403d3259c3eefcd79226cd46f4533ee4c562957 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Mar 2020 13:19:25 +0300 Subject: Provisioning: Add git installation for Windows 10 x86 RTA needs git Change-Id: I1b295b364376aff2e548b2376e920cc513fac30c Reviewed-by: Matti Paaso --- coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 new file mode 100644 index 00000000..38106de7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-git.ps1" -- cgit v1.2.3 From 657413a101e996e6b733cda83bc640574f96a372 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Mar 2020 09:41:00 +0300 Subject: Pre-provisioning: Install MSVC 2015 update 3 to Tier1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3626 Change-Id: I7f2077af4f399c1ba607bbd3f772856c953029f4 Reviewed-by: Tony Sarajärvi --- coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt new file mode 100644 index 00000000..cfd6a4c4 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt @@ -0,0 +1,14 @@ +# Install visual studio 2015 + +version = "2015 update 3" +installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe" +# Select default values +# Make sure these are selected: + * All values from 'Universal Windows App Development Tools' + * 'Visual C++' + * 'Common Tools for Visual C++ 2015' + * 'Windows XP Support for C++' + * 'Common Tools and Software Development Kits' + * 'Android Native Development Kit (R11C, 32 bits) + * 'Apache Ant (1.9.3) + -- cgit v1.2.3 From 81ab1ffb898dff4f52d9295ac96be7863555fdbb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 1 Apr 2020 22:31:08 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I1f9e9a31a313577ddb9325b9485f26dc782e4284 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index cc1d891b..00d9f68c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cc1d891b8ed1c4f23183e4b06f46e5840a993e35 +Subproject commit 00d9f68c411a336e451065ae71b8d0fb0d44da60 diff --git a/qtconnectivity b/qtconnectivity index 58e0224a..280cfd43 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 58e0224a6677667b1102b34ad5b35a787bd74077 +Subproject commit 280cfd43012d1cfbfcd26fe57f633db3fc13a379 diff --git a/qtdeclarative b/qtdeclarative index 92fc8e4c..8ace780b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 92fc8e4cb82aaa0e2996e38d8e16317e5cb8f972 +Subproject commit 8ace780b5aa298e3c01903bfd57f766a42209191 diff --git a/qtdoc b/qtdoc index 9dbfb42c..7634e39b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9dbfb42c2176d6790c1be516df220426e35aa179 +Subproject commit 7634e39bccf807fad270fa95a7d55a70d1cb3839 diff --git a/qtlocation b/qtlocation index a0e88ed1..ccfcf832 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a0e88ed10cd07d4bdf79d7e7f05f01179f2eb296 +Subproject commit ccfcf832862582cd0e7c6b33547c9bf9d3b47240 diff --git a/qtqa b/qtqa index 50020b4d..af377a33 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 +Subproject commit af377a33104ccaed85e15f8cc0069c6d35269ca8 diff --git a/qtquick3d b/qtquick3d index 2c425cf3..b14b14e9 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2c425cf308188a0b3fc3f288ee71934a4ed4da40 +Subproject commit b14b14e9194708cf02df1149bd735f6ce245c3e4 diff --git a/qtrepotools b/qtrepotools index fbe6d232..03c8458d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit fbe6d232ba331f08c154465da64a2d2560774427 +Subproject commit 03c8458dd00a594a6087ceaa16f3c297de6f200a diff --git a/qtserialbus b/qtserialbus index 275ed191..42da962b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 275ed191e6452d7e623cff0cde0beb9e416a8e46 +Subproject commit 42da962b67b4af36a9930b447e0bbef417a646a0 diff --git a/qttranslations b/qttranslations index c14fdb76..17dc9a39 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c14fdb76539156836eb3d1c1a3d6b6875550c24c +Subproject commit 17dc9a39faea23696f978be1b3fcb0b71b92c4e9 diff --git a/qtwebengine b/qtwebengine index 9522dc8f..0223d291 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9522dc8f71e189cf75eabdca4b3fab2d254d1542 +Subproject commit 0223d2911cea5a8a412e4b8a625c19b8c8b7848b -- cgit v1.2.3 From b3f626f83d1ea9c72659f7a0e34eda6a3d189eb4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 1 Apr 2020 23:45:47 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: Ibb6f659e59b861066d1e2b0c3e11574785268b93 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index e819e8d6..dd84bf4a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e819e8d654fb8d15d24961d56578025c6171610c +Subproject commit dd84bf4a99bb181fc1176830b4504d6f023898d8 diff --git a/qtactiveqt b/qtactiveqt index 927a76c9..8ca33721 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 927a76c9246109f14b51bd9a3cf224d6f987e10d +Subproject commit 8ca337213f1e79abca96a70a17f771f322c58319 diff --git a/qtbase b/qtbase index 34fe5f75..7ed097b3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 34fe5f75bcfd382b3928e221b5c9a002545fe3b9 +Subproject commit 7ed097b31f7e15812144c360021872cf8f11821e diff --git a/qtdeclarative b/qtdeclarative index 861f53d6..8dfcc719 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 861f53d60cc2dd8bd8529c65863af881dbdd8db8 +Subproject commit 8dfcc71953cd36370bcf19f537445e3766f39635 diff --git a/qtdoc b/qtdoc index 752816a8..e3d74af3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 752816a86f93c200d45d405df2f972d6eba9c23d +Subproject commit e3d74af3849ba2c1c5e9e1f369849021feb7f272 diff --git a/qtimageformats b/qtimageformats index 5a1a12b0..7625a06b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5a1a12b0e135eb49f7b232c729859583b76bd507 +Subproject commit 7625a06bd7bfcf77e896086d049b334f1b66c75d diff --git a/qtlocation b/qtlocation index ae9a8826..05659943 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ae9a8826d73fa689e81c43038bb13226c9cb9ac7 +Subproject commit 05659943df25a4ab6edcbfc8ebaa6bc23a2eb72f diff --git a/qtmultimedia b/qtmultimedia index 00ae18f9..d0e01192 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 00ae18f986cadc4c888625fb63b2ca89da1f986f +Subproject commit d0e0119251288c9c7224c5c6797a1377032aac2f diff --git a/qtqa b/qtqa index 50020b4d..af377a33 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50020b4d53245e62812cc6e54d492d0251840147 +Subproject commit af377a33104ccaed85e15f8cc0069c6d35269ca8 diff --git a/qtquick3d b/qtquick3d index 7d23aba8..91704d00 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7d23aba8c2e6c19b2ed7ad91c3e27405c211c991 +Subproject commit 91704d001196be41d9cc59b22692b73cf8d409d9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 62c8ae30..e7b8ac68 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 62c8ae30880886f3ed17ddc17713db1a7410964e +Subproject commit e7b8ac68cf0284b97fe130d4d3676b2c651b5b05 diff --git a/qtremoteobjects b/qtremoteobjects index 5c6df27b..5ac51056 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5c6df27b4f822cfe485154336f9143e261cb37b9 +Subproject commit 5ac51056f9b99ca6741e008bdd77cce10107bd91 diff --git a/qtrepotools b/qtrepotools index fbe6d232..03c8458d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit fbe6d232ba331f08c154465da64a2d2560774427 +Subproject commit 03c8458dd00a594a6087ceaa16f3c297de6f200a diff --git a/qtserialbus b/qtserialbus index 1a893e24..1274acb4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1a893e24a96d9a276b68f6ae9baee9f86f885d2c +Subproject commit 1274acb4bf4cdd06781495f5d9f90adb7268c318 diff --git a/qttools b/qttools index 02265f9b..8685a264 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 02265f9bbc213d219afc345594307affb900e07e +Subproject commit 8685a264d6961a759257bb3c8ece0beffca2bd14 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b2624d70..d2648237 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b2624d70e91c5e28740da4a0a9360d7a5b426b96 +Subproject commit d2648237c7e3bfc03077b7b1e63c72dc24ff519c diff --git a/qtwebengine b/qtwebengine index df241d15..3394cde4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit df241d1585e2ef6be28e38182cdf7e562e9c1a8a +Subproject commit 3394cde4e89463ba49af379b89863c7731c4b4ac diff --git a/qtxmlpatterns b/qtxmlpatterns index 5ca8c0bc..0964e5c3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5ca8c0bc4e7e2f3af9a8d91d00ad11329a7cab8a +Subproject commit 0964e5c37395d7d5f6c50d1e659d3bc8f2707711 -- cgit v1.2.3 From 8101b5471497ff9a617439971e7fdea0557fd39d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 19 Dec 2019 15:28:53 +0200 Subject: Provisioning: Update Windows 10 x86_64 to version 1909 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are also updated to tier1 image: msvc 2017: Not installed msvc 2019: version 16.4.4 msvc 2019 build tools: version 16.4.4 Task-number: QTQAINFRA-3623 Task-number: QTQAINFRA-3417 Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 12 +-- coin/platform_configs/flashing-wizard.yaml | 4 +- coin/platform_configs/qdb.yaml | 4 +- coin/platform_configs/qt5.yaml | 20 ++--- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtconnectivity.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 +- coin/platform_configs/tqtc-qt-config-gui.yaml | 4 +- .../README_MANUAL_INSTALLATIONS | 60 +++++++++++--- .../disable-clean-manager.ps1 | 8 ++ .../qtci-windows-10-x86_64/disable-ntp.ps1 | 2 +- .../disable-schedule-tasks.ps1 | 2 +- .../disable-update-orchestrator.ps1 | 1 - .../qtci-windows-10-x86_64/disable-windefender.ps1 | 6 +- .../qtci-windows-10-x86_64/msvc2015_update.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2017.ps1 | 88 --------------------- .../qtci-windows-10-x86_64/msvc2019.ps1 | 91 ---------------------- .../qtci-windows-10-x86_64/msvc2019.txt | 67 ++++++++++++++++ .../msvc_2015_update3_patch.ps1 | 67 ---------------- coin/provisioning/common/windows/install-msys2.ps1 | 11 ++- .../00-disable-clean-manager.ps1 | 1 - 21 files changed, 165 insertions(+), 293 deletions(-) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6ef67f56..3fdefd84 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['DisableTests'] 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% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] 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++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target arch: 'x86' Compiler: 'MSVC2019' 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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' 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 -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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' 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 -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' 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 -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' 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% -qt-zlib' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 78a33c5b..eff6e9f6 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' 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% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 69f4b77f..f18909fe 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -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%' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -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%' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 0dbb980c..56012f36 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' 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 -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -20,26 +20,26 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2019' 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-msvc2019 -xplatform winrt-arm-msvc2019 -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Compiler: 'MSVC2019' 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-msvc2019 -xplatform winrt-x64-msvc2019 -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -63,7 +63,7 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /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-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,7 +101,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /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' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index f1b6ca7b..a520e6ca 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ 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-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 30ac284d..6c232f2a 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 322f1754..246925fb 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index 22eaaffa..ad35fc2c 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' 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% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index c2daf225..fd646cbf 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -1,14 +1,50 @@ # List about manual pre-installations to Tier1 image: -Vmware tools: installed -Resolution: 1280 X 800 -Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin) -Remote Desktop Connection: enabled -Timezone: set to UTC -Administrator tools - services - Windows search: stop & disable -Power settings screen & slee: never -Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" -MSVC 2019 build tools (default installation, no additional selections). - * Install after MSVC2019 is installed! - * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" - * Version: 16.3.10 +Virtual Hardware: +CPU: 4 +Memory: 8 GB +Hard Disk: 550 GB +CI_NW +Video Card - total memory: 32MB + +VM Options: +Boot options/Firmware: BIOS + +Language: English US +Keyboard: finnish +location: finnish +Windows 10 Enterprise +Region: Finland +Keyboard layout: Finnish + +* VMware tools (complete) installed +* Resolution set to 1280x800 +* Coin-setup: + - Installing Boostrap agent + - Disabling fast boot + - Disabling firewall + - Disabling UAC + - Enabling autologin + - Automatic login + - Disabling windows updates +* Windows Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' + - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' + - NOTE! Without this step windows defender can't be disabled! +* Remote connections allowed: + - Enable Remote Desktop +* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" + - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"' +* Time zone: Coordinated Universal Time +* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable +* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable +* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never' +* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support +* Google Chrome installed for RTA +* Turn off Virus & threat protection (all sections) manually + - Real-tiem protection -> off + - Cloud-delivered protection -> off + - Automatic sample submission -> off + - Tamper protection -> off +* Activate Windows +* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs' + - Add feature 'Debugging Tools for Windows' diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 new file mode 100644 index 00000000..45ce141f --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 @@ -0,0 +1,8 @@ +# This script will disable automatic disk cleanup + +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F" + +# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space. +DisableSchedulerTask "DiskCleanup\SilentCleanup" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 index 757f0d18..22651763 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" # Disable the NTP from syncing Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 index 351f10c6..1febd88c 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" # This script will remove unneeded Tasks from Task Scheduler diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 index 5ae8fb0d..c7f23470 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 @@ -8,7 +8,6 @@ icacls $path /grant Administrators:F /T SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE del "$path\Schedule Scan" del "$path\Schedule Scan Static Task" -del "$path\Backup Scan" del "$path\UpdateModelTask" del "$path\USO_UxBroker" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 02ed54da..21938f7f 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -35,10 +35,14 @@ # # If disabled manually, windows will automatically enable it after # some period of time. Disabling it speeds up the builds. +# NOTE! Windows Defender Antivirus needs to be turned off! +# Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' +# Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" # 'Windows Defender Cache Maintenance' - "Periodic maintenance task." DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 00f8af72..69f3e27b 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -33,7 +33,7 @@ # Visual Studio $version was installed manually using $installer. $version = "2015 update 3" -$version_number ="14.0.25431.01" +$version_number ="14.0.25420.1" $installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" # default plus following components were selected: diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 deleted file mode 100644 index c4b04df0..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -# Visual Studio $version version $version_number was installed manually using $installer. - -$version = "2017" -# Current version was manually upgraded from the installer -$version_number = "15.9.17" -$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" - -# Following components were selected from installer: -# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) -# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) -# Microsoft.Component.NetFX.Native (.NET Native) -# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) -# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) -# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) -# Microsoft.Component.ClickOnce (ClickOnce Publishing) -# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) -# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) -# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) -# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) -# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) -# Microsoft.Component.MSBuild (MSBuild) -# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools) -# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) -# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) -# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) -# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) -# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) -# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) -# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) -# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) -# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) -# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) -# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) -# Component.Linux.CMake (Visual C++ tools for CMake and Linux) -# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) -# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) -# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) -# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) -# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) -# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) -# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) -# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) -# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) - -echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 deleted file mode 100644 index 538d478c..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 +++ /dev/null @@ -1,91 +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$ -## -############################################################################# - -# Visual Studio $version version $version_number was installed manually using $installer. - -$version = "2019" -# Current version was manually upgraded from the installer -$version_number = "16.3.10" -$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" - -.NET Framework 4.5 targeting pack -.NET Framework 4.5.1 targeting pack -.NET Framework 4.5.2 targeting pack -.NET Framework 4.6.1 SDK -.NET Framework 4.6.1 targeting pack -.NET Framework 4.6.2 SDK -.NET Framework 4.6.2 targeting pack -.NET Framework 4.7.2 SDK -.NET Framework 4.7.2 targeting pack -.NET Native -.NET Portable Library targeting pack -CLR data typer for SQL Sever -Connectivity and publishing tools -Data sources for SQL Server support -SQL ADAL runtime -SQL Server Command Linne Utilities -SQL Server Data Tools -SQL Server Express 2016 LocalDB -SQL Server ODBC Driver -ClickOnce Publishing -Developer Analytics tools -NuGet package manager -Text Template Transformation -C# and Visual Basic Roslyn compilers -C++ 2019 Redistributable Update -C++ Cmake tools for Windows -C++/CLI support for v142 build tools -MSBuild -MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) -MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) -.NET profiling tools -C++ profiling tools -JavaScript diagnostics -Just-In-Time debugger -C# and Visual Basic -C++ core features -JavaSript and TypeScript language support -Razor Language Services -Graphics debugger and GPU profiler for DirectX -Image and 3D model editors -C++ ATL for v142 build tools (x86 & x64) -TypeScript 3.3 SDK -Windows 10 SDK (10.0.16299.0) -Windows 10 SDK (10.0.17134.0) -Windows 10 SDK (10.0.17763.0) -Windows 10 SDK (10.0.18362.0) - -# NOTE! Work loads were added during installation! - -echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt new file mode 100644 index 00000000..28f63762 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -0,0 +1,67 @@ +# Visual Studio $version version $version_number was installed manually using $installer. + +$version = "2019" +# Current version was manually upgraded from the installer +$version_number = "16.4.4" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" + +MSVC 2019 build tools (default installation, no additional selections). + * Install after MSVC2019 is installed! + * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" + * Version: 16.4.4 + +Installed MSVC-2019 Components: + +.NET Framework 4.5 targeting pack +.NET Framework 4.5.1 targeting pack +.NET Framework 4.5.2 targeting pack +.NET Framework 4.6.1 SDK +.NET Framework 4.6.1 targeting pack +.NET Framework 4.6.2 SDK +.NET Framework 4.6.2 targeting pack +.NET Framework 4.7.2 SDK +.NET Framework 4.7.2 targeting pack +.NET Native +.NET Portable Library targeting pack +CLR data typer for SQL Sever +Connectivity and publishing tools +Data sources for SQL Server support +SQL ADAL runtime +SQL Server Command Linne Utilities +SQL Server Data Tools +SQL Server Express 2016 LocalDB +SQL Server ODBC Driver +ClickOnce Publishing +Developer Analytics tools +NuGet package manager +Text Template Transformation +C# and Visual Basic Roslyn compilers +C++ 2019 Redistributable Update +C++ Cmake tools for Windows +C++/CLI support for v142 build tools /14.24) +MSBuild +MSVC v142 - VS 2019 C++ ARM build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM build tools (v14.24) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24) +.NET profiling tools +C++ profiling tools +JavaScript diagnostics +Just-In-Time debugger +C# and Visual Basic +C++ core features +JavaSript and TypeScript language support +Razor Language Services +Graphics debugger and GPU profiler for DirectX +Image and 3D model editors +C++ ATL for latest v142 build tools (x86 & x64) +TypeScript 3.7 SDK +Windows 10 SDK (10.0.16299.0) +Windows 10 SDK (10.0.17134.0) +Windows 10 SDK (10.0.17763.0) +Windows 10 SDK (10.0.18362.0) + +# NOTE! Work loads were added during installation! + diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 deleted file mode 100644 index bfbb397a..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,67 +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\helpers.ps1" - -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx - -$version = "2015 update3 (KB3165756)" -$packagePath = "C:\Windows\Temp" -$package = $packagePath + "\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" - -if (Test-Path $preparedPackage) { - # The prepared package contains updated packages so that not everything has to be downloaded - Write-Host "Using prepared package" - Copy-Item -Recurse $preparedPackage $packagePath - # Remove the whole downloaded folder - $toRemove = $packagePath + "\vs14-kb3165756-update" - $executable = "$toRemove\vs14-kb3165756.exe" -} else { - Write-Host "Fetching patch for Visual Studio $version..." - Download $url_official $url_cache $package - $executable = $package - # Remove the downloaded executable - $toRemove = $executable -} - -Verify-Checksum $executable $sha1 -Write-Host "Installing patch for Visual Studio $version..." -Run-Executable $executable "/norestart /passive" - -Remove-Item -Force -Recurse -Path $toRemove - -Write-Output "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c4a9680..b26df151 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -61,8 +61,13 @@ 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`"" +# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. +cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Start-Sleep -s 30 +cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } +if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 deleted file mode 100644 index 1dc08d21..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" -- cgit v1.2.3 From 861e9424813b9400dd7d854fc9997a243022b240 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 4 Apr 2020 22:31:30 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: Ib6d80439b2c9dca1c76c0810769d991db8ee3d58 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 68407862..0ebf4740 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 68407862766c514eb77270fdb5ab2890e74b59b3 +Subproject commit 0ebf47400335c1a08c0f75474d23d107b4cf277f diff --git a/qtbase b/qtbase index 00d9f68c..8ed14a3c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 00d9f68c411a336e451065ae71b8d0fb0d44da60 +Subproject commit 8ed14a3c481c3fc59f10cd084ea203cb45e89309 diff --git a/qtdeclarative b/qtdeclarative index 8ace780b..5050ebd7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8ace780b5aa298e3c01903bfd57f766a42209191 +Subproject commit 5050ebd7a5c9d181af8bc037aaed05ff3f9b0ca6 diff --git a/qtqa b/qtqa index af377a33..930a856e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit af377a33104ccaed85e15f8cc0069c6d35269ca8 +Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a diff --git a/qtwebengine b/qtwebengine index 0223d291..b6887191 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0223d2911cea5a8a412e4b8a625c19b8c8b7848b +Subproject commit b688719130142e1bee4b7e1c010332dc65e89cb5 -- cgit v1.2.3 From be31c59312dc5e206c62aac04f1e6e5c99555d09 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 6 Apr 2020 23:46:20 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I831f980c63a715420a664171546fad03667862bc Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index dd84bf4a..622c757a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dd84bf4a99bb181fc1176830b4504d6f023898d8 +Subproject commit 622c757a93624c660de9a33fc833a10de6a2efe6 diff --git a/qtandroidextras b/qtandroidextras index 934bb1fb..645acc14 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 934bb1fba36ba9272a99be87bde72daf31de37d5 +Subproject commit 645acc14632f39b3adcc4312d7d1cf8ff915c8c3 diff --git a/qtbase b/qtbase index 7ed097b3..12fc3f57 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7ed097b31f7e15812144c360021872cf8f11821e +Subproject commit 12fc3f575102a69fcfba36eeb9ae04bd3d54d820 diff --git a/qtdeclarative b/qtdeclarative index 8dfcc719..d552cd3f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8dfcc71953cd36370bcf19f537445e3766f39635 +Subproject commit d552cd3f50efb9b67c7be88009392d601d3c6682 diff --git a/qtdoc b/qtdoc index e3d74af3..a86bcb6b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e3d74af3849ba2c1c5e9e1f369849021feb7f272 +Subproject commit a86bcb6bc3b3a2cdbed07befe98d967968f638fe diff --git a/qtlocation b/qtlocation index 05659943..eda2a7c2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 05659943df25a4ab6edcbfc8ebaa6bc23a2eb72f +Subproject commit eda2a7c286058176e1906d0ddc88d4e2cfbec55e diff --git a/qtmultimedia b/qtmultimedia index d0e01192..7f0503ac 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d0e0119251288c9c7224c5c6797a1377032aac2f +Subproject commit 7f0503acb042d047682b432e68ed97b1644c3f59 diff --git a/qtqa b/qtqa index af377a33..930a856e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit af377a33104ccaed85e15f8cc0069c6d35269ca8 +Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a diff --git a/qtquick3d b/qtquick3d index 91704d00..ba49d22e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 91704d001196be41d9cc59b22692b73cf8d409d9 +Subproject commit ba49d22e9dce12f2a85b91d4876d8e1aee0792df diff --git a/qtquicktimeline b/qtquicktimeline index 973e5e6d..87d429e0 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 973e5e6da27cee94d95ed05cc4251c70381e9ad9 +Subproject commit 87d429e0ada30197945a65a91fcaedd935a37ad0 diff --git a/qtremoteobjects b/qtremoteobjects index 5ac51056..9ec14db5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5ac51056f9b99ca6741e008bdd77cce10107bd91 +Subproject commit 9ec14db5a9f735eb4286984f934568f089627bd7 diff --git a/qtrepotools b/qtrepotools index 03c8458d..d6e8ca40 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 03c8458dd00a594a6087ceaa16f3c297de6f200a +Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 diff --git a/qtserialport b/qtserialport index b30052fa..ff3fd7b0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b30052fa41f6332f20ec440dcdbcd06b41a954f5 +Subproject commit ff3fd7b0330cb76772066ce7162320f4dc1a5c28 diff --git a/qttools b/qttools index 8685a264..78e8a23e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8685a264d6961a759257bb3c8ece0beffca2bd14 +Subproject commit 78e8a23e171569d231c3b8cd14fddef1e9b10a34 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d2648237..b3556c25 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d2648237c7e3bfc03077b7b1e63c72dc24ff519c +Subproject commit b3556c25ffdc64595e41d005b091776035134846 diff --git a/qtwebengine b/qtwebengine index 3394cde4..6b62dfe7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3394cde4e89463ba49af379b89863c7731c4b4ac +Subproject commit 6b62dfe7242ce0d3067aa98620664a4dc7a656d8 -- cgit v1.2.3 From 26526c4560d05fa10112ce6822eea55a20fbdb12 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 8 Apr 2020 22:31:09 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I4c3ec2af33f0fccb8b5864340ba27187028f8a1d Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtwayland | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 0ebf4740..4c58d1a7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0ebf47400335c1a08c0f75474d23d107b4cf277f +Subproject commit 4c58d1a7a87e09e9bba47e232113afcbad8f2b81 diff --git a/qtbase b/qtbase index 8ed14a3c..2bf5e2ed 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ed14a3c481c3fc59f10cd084ea203cb45e89309 +Subproject commit 2bf5e2edbb67d6bc0ad021f79c2ff3939a174669 diff --git a/qtconnectivity b/qtconnectivity index 280cfd43..5b1119b8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 280cfd43012d1cfbfcd26fe57f633db3fc13a379 +Subproject commit 5b1119b82570ce3dd1f7f45601ebffe8e9ac14c3 diff --git a/qtdeclarative b/qtdeclarative index 5050ebd7..2cefb096 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5050ebd7a5c9d181af8bc037aaed05ff3f9b0ca6 +Subproject commit 2cefb096768b1d8d30b4d0705a622f1c7d041344 diff --git a/qtmultimedia b/qtmultimedia index 2a888bc3..0721c057 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2a888bc3fb72069e735faad42e8325f60a5d7412 +Subproject commit 0721c05771e89364023309fa252d70bdfafab2b4 diff --git a/qtrepotools b/qtrepotools index 03c8458d..d6e8ca40 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 03c8458dd00a594a6087ceaa16f3c297de6f200a +Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 diff --git a/qtwayland b/qtwayland index 2e61283f..1d18591d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2e61283f7999f3d518dfc421f1298ace59e833bd +Subproject commit 1d18591d9e7ed9b3580e06c37be23bfde24bc30c -- cgit v1.2.3 From 2c10dd3510ca5e84c4a25561772c195ea8bc887e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 8 Apr 2020 23:46:19 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I820f8ebf9e428fe2b71b0aa64e5c6aeca744b82e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 622c757a..51719ae6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 622c757a93624c660de9a33fc833a10de6a2efe6 +Subproject commit 51719ae6e726ef8a30e7d0ab3e84d97b2ca67857 diff --git a/qtbase b/qtbase index 12fc3f57..9901d39e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12fc3f575102a69fcfba36eeb9ae04bd3d54d820 +Subproject commit 9901d39ea6012621350a4e2a3f1466803c60829e diff --git a/qtdeclarative b/qtdeclarative index d552cd3f..bf205b45 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d552cd3f50efb9b67c7be88009392d601d3c6682 +Subproject commit bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9 diff --git a/qtdoc b/qtdoc index a86bcb6b..d9b39705 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a86bcb6bc3b3a2cdbed07befe98d967968f638fe +Subproject commit d9b39705b08defd13ba351644666da0ecf5e6189 diff --git a/qtmultimedia b/qtmultimedia index 7f0503ac..d5a1385c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7f0503acb042d047682b432e68ed97b1644c3f59 +Subproject commit d5a1385c7df4714df571d7f80916708b47767a57 diff --git a/qtwayland b/qtwayland index e2d2d7e0..57e31dd1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e2d2d7e06ae4d054d75738038645126bce9092ad +Subproject commit 57e31dd17cbf22e8bdebc5e4a537dd3d632936f7 diff --git a/qtwebengine b/qtwebengine index 6b62dfe7..e8284237 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6b62dfe7242ce0d3067aa98620664a4dc7a656d8 +Subproject commit e828423722cb57d55c0cb5fc66e3911b76197cd8 -- cgit v1.2.3 From 5148639647ca7d98ac94aaa90f8d650e68d0f592 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 9 Apr 2020 13:29:58 +0300 Subject: Provisioning: Activate subscriptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3638 Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943 Reviewed-by: Tony Sarajärvi --- .../01-refresh-subscription-manager.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 index 84238ebf..e26a1e0d 100755 --- 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 @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,7 +33,11 @@ ## ############################################################################# -set -ex +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh # refresh local certificates sudo subscription-manager refresh @@ -41,3 +45,4 @@ sudo subscription-manager refresh # Attach available subscriptions to system. This is needed when subscriptions are renewed. sudo subscription-manager attach --auto +sudo rm -f /tmp/redhat_ak.sh -- cgit v1.2.3 From 606bbd68c426e5c8f080d64c2b4b5068dffd6662 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Apr 2020 22:31:06 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: Ic9e8123184a04c43ad06aee8cabc2f97006ca694 Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 0721c057..7bd13d3f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0721c05771e89364023309fa252d70bdfafab2b4 +Subproject commit 7bd13d3f98a6f1f9cf7aed122fd2f301fbae9d62 diff --git a/qtwebengine b/qtwebengine index b6887191..9136c16a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b688719130142e1bee4b7e1c010332dc65e89cb5 +Subproject commit 9136c16ae640aec8ab393237ce1a1c7f89c8bb1d -- cgit v1.2.3 From bb13978b016205c7e8a599640e42031cbbdda64d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 16 Mar 2020 11:31:24 +0200 Subject: Provisioning: Disable Connected User Experiences and Telemetry service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3609 Change-Id: Ie4df9a3b47cf9adcfc0afa1eaf75386e9452fd42 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86/01-disable-windows-telemetry.ps1 | 7 +++++++ .../qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 new file mode 100644 index 00000000..3f5a75f4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 @@ -0,0 +1,7 @@ +# Disable Connected User Experiences and Telemetry service +# The Connected User Experiences and Telemetry service enables features that support in-application and connected user experiences. +# Additionally, this service manages the event driven collection and transmission of diagnostic and usage information +# (used to improve the experience and quality of the Windows Platform) when the diagnostics and usage privacy option settings are enabled under Feedback and Diagnostics. +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Data Collection" /V AllowTelemetry /T REG_dWORD /D 0 /F +stop-service diagtrack +set-service diagtrack -startuptype disabled diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 new file mode 100644 index 00000000..3f5a75f4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 @@ -0,0 +1,7 @@ +# Disable Connected User Experiences and Telemetry service +# The Connected User Experiences and Telemetry service enables features that support in-application and connected user experiences. +# Additionally, this service manages the event driven collection and transmission of diagnostic and usage information +# (used to improve the experience and quality of the Windows Platform) when the diagnostics and usage privacy option settings are enabled under Feedback and Diagnostics. +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Data Collection" /V AllowTelemetry /T REG_dWORD /D 0 /F +stop-service diagtrack +set-service diagtrack -startuptype disabled -- cgit v1.2.3 From 8a5938bd2288c13dfe41c289c8ed0647cfa412e9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 13 Apr 2020 23:45:47 +0200 Subject: Update submodules on '5.15' in qt/qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie44a49c9f1d432865b37297323418c0a831b502c Reviewed-by: Tony Sarajärvi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtspeech | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 51719ae6..93117992 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 51719ae6e726ef8a30e7d0ab3e84d97b2ca67857 +Subproject commit 9311799215228989a7da85c24a73e6757cc6731a diff --git a/qtactiveqt b/qtactiveqt index 8ca33721..cdd58e2c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8ca337213f1e79abca96a70a17f771f322c58319 +Subproject commit cdd58e2c155063f9b52b69a47f45c2430214e3a4 diff --git a/qtbase b/qtbase index 9901d39e..bfb9b02d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9901d39ea6012621350a4e2a3f1466803c60829e +Subproject commit bfb9b02d3b36244dc19c94a5693071a738bac8a2 diff --git a/qtdeclarative b/qtdeclarative index bf205b45..574e74ff 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9 +Subproject commit 574e74ffed00158ab0dc251c2789f4dccbf01eae diff --git a/qtquick3d b/qtquick3d index ba49d22e..6b0defe7 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ba49d22e9dce12f2a85b91d4876d8e1aee0792df +Subproject commit 6b0defe7bd0ce54bd1b830f87cff08533e4aa591 diff --git a/qtspeech b/qtspeech index d8f4cfd5..6c5b8905 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d8f4cfd515cca34cb6bcba06f59db231cebf8e09 +Subproject commit 6c5b8905e41dd0c90554bb222840210f12481a36 diff --git a/qttranslations b/qttranslations index 64adb8c0..95ece410 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 64adb8c01d477cec0b8fe3e3903778eb0c71a620 +Subproject commit 95ece41082b43ec1b85e33074229941f4db71bb7 diff --git a/qtwebengine b/qtwebengine index e8284237..e6d4d15b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e828423722cb57d55c0cb5fc66e3911b76197cd8 +Subproject commit e6d4d15b03fa67524269bc8e1beb04dcc704db03 -- cgit v1.2.3 From 61267a7a784ce5370f1a0253f5f001d9b6d82e65 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 31 Mar 2020 10:28:38 +0300 Subject: Provisioning: Remove notifications and warnings from macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notifications and warnings in UI might affect RTA and autotests results Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25 Reviewed-by: Johanna Äijälä --- .../common/macos/disable-notifications_and_warnings.sh | 7 +++++++ .../01-disable-notifications_and_warnings.sh | 3 +++ .../01-disable-notifications_and_warnings.sh | 3 +++ 3 files changed, 13 insertions(+) create mode 100755 coin/provisioning/common/macos/disable-notifications_and_warnings.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh diff --git a/coin/provisioning/common/macos/disable-notifications_and_warnings.sh b/coin/provisioning/common/macos/disable-notifications_and_warnings.sh new file mode 100755 index 00000000..c40a4f65 --- /dev/null +++ b/coin/provisioning/common/macos/disable-notifications_and_warnings.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "Unload notificationcenterui.plist" +launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist + +echo "Remove 32-bit warnings" +rm ~/Library/Preferences/com.apple.coreservices.uiagent.plist diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh -- cgit v1.2.3 From 08b99e8def4db7e768cb9dcc456e25852081cf5d Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Tue, 7 Apr 2020 09:57:17 +0300 Subject: qdb building for mac Modified qdb.yaml and created and pkgconfig and libusb relates .sh files so that QDB can be build for Mac OS due to USB Ethernet CDCECM enabling. Task-number: QTBUG-82531 Change-Id: Ia5f970e5940b7d9116831c8174db0ea1b9231234 Reviewed-by: Samuli Piippo --- coin/platform_configs/qdb.yaml | 5 +++ coin/provisioning/common/macos/libusb.sh | 43 ++++++++++++++++++++++ coin/provisioning/common/macos/pkgconfig.sh | 43 ++++++++++++++++++++++ .../qtci-macos-10.13-x86_64/26-pkgconfig.sh | 7 ++++ .../qtci-macos-10.13-x86_64/27-libusb.sh | 7 ++++ 5 files changed, 105 insertions(+) create mode 100755 coin/provisioning/common/macos/libusb.sh create mode 100755 coin/provisioning/common/macos/pkgconfig.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index f18909fe..544a1b90 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -17,6 +17,11 @@ Configurations: 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 -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + 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 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh new file mode 100755 index 00000000..cf9e7150 --- /dev/null +++ b/coin/provisioning/common/macos/libusb.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 libusb +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install libusb +read -r -a arr <<< $(brew list --versions libusb) +version=${arr[1]} +echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/pkgconfig.sh b/coin/provisioning/common/macos/pkgconfig.sh new file mode 100755 index 00000000..9fad4912 --- /dev/null +++ b/coin/provisioning/common/macos/pkgconfig.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 pkgconfig +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install pkgconfig +read -r -a arr <<< $(brew list --versions pkgconfig) +version=${arr[1]} +echo "pkgconfig = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh new file mode 100755 index 00000000..9362a345 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install pkgconfig + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pkgconfig.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh new file mode 100755 index 00000000..acc7ad4f --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libusb + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libusb.sh" -- cgit v1.2.3 From 176d9ce09c8abcc232a4bd5ebc2ac6d6413113af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 5 Mar 2020 13:19:10 +0100 Subject: Don't manually rerun conan Run-Conan-Install Modern conan will retry downloads on its own. Change default number of attempts to 5 for more reliability. Change-Id: Iafd4845b31c3e5fb296ba0b897cbf2030c412b04 Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/conan.ps1 | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index c5984e26..e7e0de22 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -77,27 +77,20 @@ function Run-Conan-Install $manifestsDir = "$PSScriptRoot\conan_manifests" $buildinfoRoot = "C:\Utils\conanbuildinfos" + # Make up to 5 attempts for all download operations in conan + $env:CONAN_RETRY = "5" + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName $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 --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } + Push-Location $outpwd + Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" + Pop-Location Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" } -- cgit v1.2.3 From 4d3751fe3b52a535a7e685edad21dd035f47c30d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 Apr 2020 23:46:34 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I2229401bd16f8f5a5f99f0b92c1ea29d03a661d9 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 93117992..0cd80d4f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9311799215228989a7da85c24a73e6757cc6731a +Subproject commit 0cd80d4f4e0390c7ba3aa2b2d36781403c1c2aae diff --git a/qtbase b/qtbase index bfb9b02d..8138c812 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bfb9b02d3b36244dc19c94a5693071a738bac8a2 +Subproject commit 8138c812cbd65233a61d6e2e2f783d060c02de60 diff --git a/qtdeclarative b/qtdeclarative index 574e74ff..94b46de4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 574e74ffed00158ab0dc251c2789f4dccbf01eae +Subproject commit 94b46de4050d023ecbb238c2636d7e252f8f5949 diff --git a/qtdoc b/qtdoc index d9b39705..5cec5e99 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d9b39705b08defd13ba351644666da0ecf5e6189 +Subproject commit 5cec5e99f391918c189d501e94523c3f1b5d3c73 diff --git a/qtmultimedia b/qtmultimedia index d5a1385c..457181d7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d5a1385c7df4714df571d7f80916708b47767a57 +Subproject commit 457181d73c5bc188cfea13e13dbe930de3b993d3 diff --git a/qtquick3d b/qtquick3d index 6b0defe7..145bca6e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6b0defe7bd0ce54bd1b830f87cff08533e4aa591 +Subproject commit 145bca6ec8447cc2a6cf9b6afdee309d904e94ec diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e7b8ac68..71757283 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e7b8ac68cf0284b97fe130d4d3676b2c651b5b05 +Subproject commit 71757283972348971a79c905f9c8b1b42870d876 diff --git a/qtspeech b/qtspeech index 6c5b8905..1b67cc56 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6c5b8905e41dd0c90554bb222840210f12481a36 +Subproject commit 1b67cc563c3233df55c16ab9c23ba111233a365b diff --git a/qttools b/qttools index 78e8a23e..1b992406 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 78e8a23e171569d231c3b8cd14fddef1e9b10a34 +Subproject commit 1b992406a6523a144c58baa9bbd1198bb9a2d98c diff --git a/qtwayland b/qtwayland index 57e31dd1..224f48fa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 57e31dd17cbf22e8bdebc5e4a537dd3d632936f7 +Subproject commit 224f48fa0d5eb325f66769054ed3e8d0a24d862a diff --git a/qtwebchannel b/qtwebchannel index 1f793c88..cbbb6c38 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1f793c887773f9b7477a73467aa1e2497ffef25c +Subproject commit cbbb6c38fa9b64e9e4eb98af0bf687ef469aa327 diff --git a/qtwebengine b/qtwebengine index e6d4d15b..3125f1ac 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e6d4d15b03fa67524269bc8e1beb04dcc704db03 +Subproject commit 3125f1ac3951c63c20110c7e3946ca281cebbdf3 diff --git a/qtwebview b/qtwebview index c6d4bb78..d47cad5c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c6d4bb78fe59a55ffce526ff951e5c5270dd92cf +Subproject commit d47cad5ca5c3788fedc0a53930e47efb869f9315 -- cgit v1.2.3 From 908afb868a109718a424e820adfcc9dec5ca753e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Apr 2020 23:46:19 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtspeech | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 0cd80d4f..9ef1e6ef 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0cd80d4f4e0390c7ba3aa2b2d36781403c1c2aae +Subproject commit 9ef1e6ef4989630f85354e9dc08b21ce78bcc4bf diff --git a/qtbase b/qtbase index 8138c812..0c651768 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8138c812cbd65233a61d6e2e2f783d060c02de60 +Subproject commit 0c651768475aa882d606efe51d10fedc44b87566 diff --git a/qtdeclarative b/qtdeclarative index 94b46de4..b3eb349d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 94b46de4050d023ecbb238c2636d7e252f8f5949 +Subproject commit b3eb349ddddec6967fcedfdbfc857b99f34e552a diff --git a/qtdoc b/qtdoc index 5cec5e99..758667d8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5cec5e99f391918c189d501e94523c3f1b5d3c73 +Subproject commit 758667d8599dd2f1d29466541ef17c8af9e08070 diff --git a/qtquick3d b/qtquick3d index 145bca6e..c7fd92ab 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 145bca6ec8447cc2a6cf9b6afdee309d904e94ec +Subproject commit c7fd92ab71dbeb8b70a85a9d1e920ffd55a45668 diff --git a/qtspeech b/qtspeech index 1b67cc56..9a773b05 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1b67cc563c3233df55c16ab9c23ba111233a365b +Subproject commit 9a773b0573c4c35d99d7d2f4314c26962c783602 diff --git a/qtwayland b/qtwayland index 224f48fa..ee5d89d5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 224f48fa0d5eb325f66769054ed3e8d0a24d862a +Subproject commit ee5d89d5589dd1ace6e9f60d4ef611e23e2dec2d diff --git a/qtwebchannel b/qtwebchannel index cbbb6c38..4af709df 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cbbb6c38fa9b64e9e4eb98af0bf687ef469aa327 +Subproject commit 4af709df207bf7c98ae5ffd699a66d33767d6300 diff --git a/qtwebengine b/qtwebengine index 3125f1ac..41e8f704 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3125f1ac3951c63c20110c7e3946ca281cebbdf3 +Subproject commit 41e8f7046949b7418c6780e342ddc0c2d4bbd026 -- cgit v1.2.3 From cafd0f00194283de93b8b0bc68613327d2a9ad17 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Apr 2020 22:30:59 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 2bf5e2ed..8ddffc6b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2bf5e2edbb67d6bc0ad021f79c2ff3939a174669 +Subproject commit 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb diff --git a/qtdeclarative b/qtdeclarative index 2cefb096..7dc0de37 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2cefb096768b1d8d30b4d0705a622f1c7d041344 +Subproject commit 7dc0de374300d66ed72f15820a4ebb78849ae0e7 diff --git a/qtmultimedia b/qtmultimedia index 7bd13d3f..19f6faf6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7bd13d3f98a6f1f9cf7aed122fd2f301fbae9d62 +Subproject commit 19f6faf671438dc9c5165733a1b060fe2dfe1956 diff --git a/qtrepotools b/qtrepotools index d6e8ca40..ecb869a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 +Subproject commit ecb869a1ed4cf30f25e9e5269000db0e0cdd2553 diff --git a/qttools b/qttools index c35cd309..676b08f9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c35cd309f480d76e44e3bd806c40f96f0384e576 +Subproject commit 676b08f947098a3dd3d417a38631567157c4e757 -- cgit v1.2.3 From 30b0878b18d20238a8351c2cf3f01f220dab14c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Apr 2020 23:46:22 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtrepotools | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 0c651768..cc106ce5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0c651768475aa882d606efe51d10fedc44b87566 +Subproject commit cc106ce56550ebfc7e1808e1b9015f5618d9f5e5 diff --git a/qtdeclarative b/qtdeclarative index b3eb349d..c83ca003 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b3eb349ddddec6967fcedfdbfc857b99f34e552a +Subproject commit c83ca003248a21e368ebfbf799ef9580e0f4e6ac diff --git a/qtdoc b/qtdoc index 758667d8..697c046c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 758667d8599dd2f1d29466541ef17c8af9e08070 +Subproject commit 697c046c1cd4c1b64e3320caf6087c6eb31f4c35 diff --git a/qtquick3d b/qtquick3d index c7fd92ab..125a65b1 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c7fd92ab71dbeb8b70a85a9d1e920ffd55a45668 +Subproject commit 125a65b1a0df07daccab0e3098c76c19ea7ecda7 diff --git a/qtrepotools b/qtrepotools index d6e8ca40..ecb869a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 +Subproject commit ecb869a1ed4cf30f25e9e5269000db0e0cdd2553 diff --git a/qttools b/qttools index 1b992406..11459960 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b992406a6523a144c58baa9bbd1198bb9a2d98c +Subproject commit 11459960cdee71a325c7373992adde8fed1db86a -- cgit v1.2.3 From 133403b82989f04367919a6737eda56d756c1261 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Apr 2020 23:46:23 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtrepotools | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 9ef1e6ef..50e8d41c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9ef1e6ef4989630f85354e9dc08b21ce78bcc4bf +Subproject commit 50e8d41cc6e23840ba98c8518965f17e75bd29b9 diff --git a/qtbase b/qtbase index cc106ce5..fa83b30c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cc106ce56550ebfc7e1808e1b9015f5618d9f5e5 +Subproject commit fa83b30ceb1861075e33dc8340d6754daef86b95 diff --git a/qtdeclarative b/qtdeclarative index c83ca003..ac9046b0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c83ca003248a21e368ebfbf799ef9580e0f4e6ac +Subproject commit ac9046b074a60ab73d7e76a48b8c69f00db9cbd2 diff --git a/qtdoc b/qtdoc index 697c046c..e633c173 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 697c046c1cd4c1b64e3320caf6087c6eb31f4c35 +Subproject commit e633c17385bd2484d152c1c69c9eb36f5bc9239f diff --git a/qtqa b/qtqa index 930a856e..ff87df77 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a +Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 diff --git a/qtquick3d b/qtquick3d index 125a65b1..c90a6c18 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 125a65b1a0df07daccab0e3098c76c19ea7ecda7 +Subproject commit c90a6c18d5723f2496bc250b92368821e47cf0bd diff --git a/qtrepotools b/qtrepotools index ecb869a1..853cc228 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ecb869a1ed4cf30f25e9e5269000db0e0cdd2553 +Subproject commit 853cc2286f0058c94f833c47d830a304de3e59c9 diff --git a/qttools b/qttools index 11459960..d690a99b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 11459960cdee71a325c7373992adde8fed1db86a +Subproject commit d690a99b99ce68cee6bde71e12a3fc6190812f3f diff --git a/qttranslations b/qttranslations index 95ece410..b0be8ca6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 95ece41082b43ec1b85e33074229941f4db71bb7 +Subproject commit b0be8ca652f732439e562f75be372730e2452042 diff --git a/qtwebengine b/qtwebengine index 41e8f704..9e56f570 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 41e8f7046949b7418c6780e342ddc0c2d4bbd026 +Subproject commit 9e56f570e31a0ef18e544bb21dfddebfe43ec2d0 -- cgit v1.2.3 From 4d435697fadc55f6a10eba0d4df4a1b30e56b380 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Apr 2020 23:46:28 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283 Reviewed-by: Qt Submodule Update Bot --- 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 +- 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 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index 50e8d41c..a01dbe5b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 50e8d41cc6e23840ba98c8518965f17e75bd29b9 +Subproject commit a01dbe5b0e1b912c7210abc304700020e685aff0 diff --git a/qtactiveqt b/qtactiveqt index cdd58e2c..a0ddb6ac 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cdd58e2c155063f9b52b69a47f45c2430214e3a4 +Subproject commit a0ddb6ace7a8cb9114d01d64e0722b0e00e5b0b3 diff --git a/qtandroidextras b/qtandroidextras index 645acc14..aa346dcc 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 645acc14632f39b3adcc4312d7d1cf8ff915c8c3 +Subproject commit aa346dcc8d8fbab9f5877d4822c06a92f521ce7b diff --git a/qtbase b/qtbase index fa83b30c..e10e5318 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa83b30ceb1861075e33dc8340d6754daef86b95 +Subproject commit e10e5318bc02a48a866b76b6f0b7f268d16af642 diff --git a/qtcharts b/qtcharts index c8e3bf29..7cdded63 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c8e3bf290551328851cf628ce4a488a06b013ac2 +Subproject commit 7cdded63b5d9d6b81c9d03a2f39d94d7b5230ccb diff --git a/qtdatavis3d b/qtdatavis3d index 407bee91..24c043fb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 407bee91eb83b6ff2df6e5d99366971bf21e2637 +Subproject commit 24c043fbffdbd7c0e060f05f67ad28824ac05e6b diff --git a/qtdeclarative b/qtdeclarative index ac9046b0..6555642d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ac9046b074a60ab73d7e76a48b8c69f00db9cbd2 +Subproject commit 6555642db7b3b992335f98dc01863db4beea3fd4 diff --git a/qtdoc b/qtdoc index e633c173..1c7c6961 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e633c17385bd2484d152c1c69c9eb36f5bc9239f +Subproject commit 1c7c69619028bf5247309d49a8edd9359ef6649f diff --git a/qtgamepad b/qtgamepad index 19671371..996ccf5b 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 196713714a63e789b65822e2222208251857359b +Subproject commit 996ccf5bbacab0d16cbd961987c08385279ad6c5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 617bb58e..7665821b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 617bb58eb0b381ae6095fe8947bc7f9e25ef85b1 +Subproject commit 7665821bc4baed9c6595d22dcaf2857e2dda77f7 diff --git a/qtimageformats b/qtimageformats index 7625a06b..26c54809 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7625a06bd7bfcf77e896086d049b334f1b66c75d +Subproject commit 26c548096b8f77b0e2f0cf0602a64d65e7958d67 diff --git a/qtmacextras b/qtmacextras index 9f58d3af..66a5de12 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9f58d3afbf3157bf9dcf3614a530fb8e179f60b9 +Subproject commit 66a5de12b601e3de8ec336ae42c795002f539a8d diff --git a/qtmultimedia b/qtmultimedia index 457181d7..b7c6c49d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 457181d73c5bc188cfea13e13dbe930de3b993d3 +Subproject commit b7c6c49d8026bebef0c86ee5b686f8519f2e8622 diff --git a/qtnetworkauth b/qtnetworkauth index 72f5b40b..5f9fbc2a 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 72f5b40b00178710b36edc7ed1769321182e7fa6 +Subproject commit 5f9fbc2a6e3f06ae388af259e074b00c491c163d diff --git a/qtpurchasing b/qtpurchasing index 6ec39500..c9a2a6dc 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00 +Subproject commit c9a2a6dcb858d2de5c908914cfe6564fa0740469 diff --git a/qtquick3d b/qtquick3d index c90a6c18..a889535f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c90a6c18d5723f2496bc250b92368821e47cf0bd +Subproject commit a889535fa1422bd29db20c6f4f8fb3872d4ac6ec diff --git a/qtquickcontrols b/qtquickcontrols index e9ad3352..7c6ae3e4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e9ad3352df0815761c1fde8ea36b040e8431f360 +Subproject commit 7c6ae3e453a1fa9e24c57123603e8a9319612f76 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 71757283..7d4f8365 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 71757283972348971a79c905f9c8b1b42870d876 +Subproject commit 7d4f8365c1e50759dd3942b006f2ee73ce9cb116 diff --git a/qtquicktimeline b/qtquicktimeline index 87d429e0..05c2a520 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 87d429e0ada30197945a65a91fcaedd935a37ad0 +Subproject commit 05c2a52042e8ac7f73da643bfa9107c10c346537 diff --git a/qtremoteobjects b/qtremoteobjects index 9ec14db5..0b98fb2b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9ec14db5a9f735eb4286984f934568f089627bd7 +Subproject commit 0b98fb2b3f59143ff8f71f7f53309e153e5af81e diff --git a/qtrepotools b/qtrepotools index 853cc228..8f06a503 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 853cc2286f0058c94f833c47d830a304de3e59c9 +Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 diff --git a/qtscript b/qtscript index 36300dd0..a5c819ce 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 36300dd06bb8191800ec93ca5a408f39b1f221eb +Subproject commit a5c819cef6efa06c8273c9b5e5e6406a0ae9c469 diff --git a/qtscxml b/qtscxml index 85ef74c2..db8b84e1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 85ef74c296716081b044db5fd9db4692443c229f +Subproject commit db8b84e117905b4792524aacddba314ae4a2f7ba diff --git a/qtsensors b/qtsensors index 3c7ddeee..5acdc122 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837 +Subproject commit 5acdc122a455bae920e9054bec4f3d769cce105e diff --git a/qtserialbus b/qtserialbus index 1274acb4..1d5fa84e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1274acb4bf4cdd06781495f5d9f90adb7268c318 +Subproject commit 1d5fa84ed9b450954a0d82e598570ec2107a5953 diff --git a/qtserialport b/qtserialport index ff3fd7b0..ef2e04ae 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ff3fd7b0330cb76772066ce7162320f4dc1a5c28 +Subproject commit ef2e04aeb4dcec04c1f21f7ef85470e07d80453e diff --git a/qtspeech b/qtspeech index 9a773b05..387f4b6b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9a773b0573c4c35d99d7d2f4314c26962c783602 +Subproject commit 387f4b6b379ac82ff4625ced5a2f1af7c4ee865e diff --git a/qtsvg b/qtsvg index 2c67415a..a26b32e1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c67415afc2e12bab958e16b18bcab88a537c248 +Subproject commit a26b32e157e4e7cd8ce90b933c4c45ed5360b388 diff --git a/qttools b/qttools index d690a99b..6f74a799 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d690a99b99ce68cee6bde71e12a3fc6190812f3f +Subproject commit 6f74a799af2c3c9c99dd425218f12fd010b5dd4b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b3556c25..70105b9b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b3556c25ffdc64595e41d005b091776035134846 +Subproject commit 70105b9b43fecff7cb0ce7a0c84b314e10e8143c diff --git a/qtwayland b/qtwayland index ee5d89d5..83fdd401 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ee5d89d5589dd1ace6e9f60d4ef611e23e2dec2d +Subproject commit 83fdd4018d05d658787c0cd49fdb766bff101234 diff --git a/qtwebchannel b/qtwebchannel index 4af709df..e38d01e7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4af709df207bf7c98ae5ffd699a66d33767d6300 +Subproject commit e38d01e78530048339722f711d58d1404b2484c0 diff --git a/qtwebglplugin b/qtwebglplugin index ab0d58ef..219abce4 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ab0d58ef0a2cd21eab7dc612004e416d3d55a78e +Subproject commit 219abce4c8fcfbbae13b66c142ee0fd1afd04313 diff --git a/qtwebsockets b/qtwebsockets index 37203fab..593466b4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 37203fab746060edaccea8abcddc181611ab0555 +Subproject commit 593466b4b902536743050e088a0e4eee9f007c76 diff --git a/qtwebview b/qtwebview index d47cad5c..a15f2b83 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d47cad5ca5c3788fedc0a53930e47efb869f9315 +Subproject commit a15f2b83c42286ab7f4b4c406e4795b6a1a9a13e diff --git a/qtwinextras b/qtwinextras index d5310efd..acb8cbb1 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d5310efd2fbbe9786a4257f3ada78381cb54da23 +Subproject commit acb8cbb19c8cda386e02e1c898291cc95e1be031 diff --git a/qtx11extras b/qtx11extras index 8136ffdf..e05196b4 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583 +Subproject commit e05196b4648e8ea28bbeea3491754c1c6db4a60c diff --git a/qtxmlpatterns b/qtxmlpatterns index 0964e5c3..84b9bd01 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0964e5c37395d7d5f6c50d1e659d3bc8f2707711 +Subproject commit 84b9bd01cbd7a066f3cb34cb7f6c1094aa2346b3 -- cgit v1.2.3 From 285f2c5690290e49313ccf8b76402c30acabbb5e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Apr 2020 20:20:35 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qttools | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index a01dbe5b..50390aef 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a01dbe5b0e1b912c7210abc304700020e685aff0 +Subproject commit 50390aefe6f990aa2b959efd2090b59fef091912 diff --git a/qtbase b/qtbase index e10e5318..e0a78bf4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e10e5318bc02a48a866b76b6f0b7f268d16af642 +Subproject commit e0a78bf4501c3102578d2de02c95418fa5bb4611 diff --git a/qtdeclarative b/qtdeclarative index 6555642d..7513e896 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6555642db7b3b992335f98dc01863db4beea3fd4 +Subproject commit 7513e896726f0dfc6e290b638c83ae45e4deb88a diff --git a/qtlocation b/qtlocation index eda2a7c2..36070d45 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eda2a7c286058176e1906d0ddc88d4e2cfbec55e +Subproject commit 36070d457cdcfc4d0a2629694bb0b34ae8a354b2 diff --git a/qtmultimedia b/qtmultimedia index b7c6c49d..f3c91611 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b7c6c49d8026bebef0c86ee5b686f8519f2e8622 +Subproject commit f3c9161147134bcc848f662947c5a59f3b48e94e diff --git a/qtquick3d b/qtquick3d index a889535f..b9f82c50 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a889535fa1422bd29db20c6f4f8fb3872d4ac6ec +Subproject commit b9f82c503a9fa5b861f683763f7c89952fc86c24 diff --git a/qtquickcontrols b/qtquickcontrols index 7c6ae3e4..44c239aa 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7c6ae3e453a1fa9e24c57123603e8a9319612f76 +Subproject commit 44c239aa1b9ff3a349f9c88f8ad3abd16aa48f3f diff --git a/qtserialport b/qtserialport index ef2e04ae..c24fd462 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ef2e04aeb4dcec04c1f21f7ef85470e07d80453e +Subproject commit c24fd46221b98eb2e9248765ae32c0fccbebcd35 diff --git a/qttools b/qttools index 6f74a799..b3cdd63d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6f74a799af2c3c9c99dd425218f12fd010b5dd4b +Subproject commit b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e -- cgit v1.2.3 From 10e07c78772d2ea499a66034f0e53c88c7097cc3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Apr 2020 20:43:19 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f Reviewed-by: Qt Submodule Update Bot --- 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 +- 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 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 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 4c58d1a7..dec1f591 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4c58d1a7a87e09e9bba47e232113afcbad8f2b81 +Subproject commit dec1f5912acb991985e96ca2cb7e5c265c737a6f diff --git a/qtactiveqt b/qtactiveqt index 6ae4d9b3..13bbc108 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6ae4d9b39285d84dad731893444f7027945900fb +Subproject commit 13bbc108561b985af5a8fc0b8d58654f9a4cfa89 diff --git a/qtandroidextras b/qtandroidextras index 2f0a5a41..6ffb02a7 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2f0a5a4192fd8ca6d00391c6307973805d23a2f2 +Subproject commit 6ffb02a7ea1d37ea99ded2c06802fd11cb10ef0d diff --git a/qtbase b/qtbase index 8ddffc6b..e03a3882 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb +Subproject commit e03a3882bea83d19879b30e312cc1d24520ed540 diff --git a/qtcharts b/qtcharts index 5d0f4509..c9d0d5db 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d0f4509012b9512e55f0a2483440d81bf32502c +Subproject commit c9d0d5dbda60a6cf704a5e5c9af42083be7766ba diff --git a/qtconnectivity b/qtconnectivity index 5b1119b8..0de627e4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5b1119b82570ce3dd1f7f45601ebffe8e9ac14c3 +Subproject commit 0de627e44fc74c6fbacf64b40a01408d1114907e diff --git a/qtdatavis3d b/qtdatavis3d index b255d892..1ae0fae9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b255d8923ba5eb8435485c1fab3f8d563ac4837c +Subproject commit 1ae0fae9ed230ccb274513b86b89cbf4940e145c diff --git a/qtdeclarative b/qtdeclarative index 7dc0de37..560bc348 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7dc0de374300d66ed72f15820a4ebb78849ae0e7 +Subproject commit 560bc348d86aba6cef5fdf88bc9d7304dd914bc8 diff --git a/qtdoc b/qtdoc index 7634e39b..f696fd45 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7634e39bccf807fad270fa95a7d55a70d1cb3839 +Subproject commit f696fd45621b21abf00ba2047ab2ee51fe509ae9 diff --git a/qtgamepad b/qtgamepad index e936e2bf..042d2e9a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e936e2bf84104668331d7f45d78d22ba190d6fba +Subproject commit 042d2e9a4f7bb18fbbf7aa16583384eeda0c4b56 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index aca14b54..399f29fb 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit aca14b548477a00028a99d8acf184ec5c6403d95 +Subproject commit 399f29fb3bda74d0f0c500efafc0d988da0589d0 diff --git a/qtimageformats b/qtimageformats index 0c4d4dc1..1eddf7d2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0c4d4dc12a68124451113e21d2c4fdc5d06d01d0 +Subproject commit 1eddf7d2c2e0e7c11c10e9f52a8e90c2f8dc4beb diff --git a/qtlocation b/qtlocation index ccfcf832..b36cd569 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ccfcf832862582cd0e7c6b33547c9bf9d3b47240 +Subproject commit b36cd5690539d29c208afa03babf9eda7b30b10e diff --git a/qtmacextras b/qtmacextras index 8245e27d..d4728d6e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8245e27d9b5e395ddfeebda39cef2b5e1b8c8d51 +Subproject commit d4728d6e95c5bb1662037b476a821eb5103018ef diff --git a/qtmultimedia b/qtmultimedia index 19f6faf6..50b0a867 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 19f6faf671438dc9c5165733a1b060fe2dfe1956 +Subproject commit 50b0a8670ba0ff460115c3ac113c19f17d36246e diff --git a/qtnetworkauth b/qtnetworkauth index 5e31c8a6..a1508b27 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5e31c8a64073a3d2d88c23f211f22e719ffcd8a0 +Subproject commit a1508b27358e2fb5437358dd189ad0fc6401ad34 diff --git a/qtpurchasing b/qtpurchasing index 35dfb472..9af9f425 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 35dfb472d44bad657b6636221c965bef67d861c2 +Subproject commit 9af9f425f8847ea605bded17a8aa55aca27a6a66 diff --git a/qtqa b/qtqa index 930a856e..ff87df77 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a +Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 diff --git a/qtquick3d b/qtquick3d index b14b14e9..ddf8ff44 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b14b14e9194708cf02df1149bd735f6ce245c3e4 +Subproject commit ddf8ff446050cb0c4e5c01a2b59d57fe7fa5ca10 diff --git a/qtquickcontrols b/qtquickcontrols index b26bfb18..1b51ca3c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b26bfb18616e2a4baf33f9f1a2c147e3f5512de6 +Subproject commit 1b51ca3ce57a13990be2aeac910b2fab3e073515 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ac9d427c..6d6919b6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ac9d427cd22e9b0c820dafd68ab17cca930c841d +Subproject commit 6d6919b6f09210dc7acf6b2ff4849c5e39b08956 diff --git a/qtquicktimeline b/qtquicktimeline index 7f05ba00..45232bb4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7f05ba0039134598dffa17c2ef3e234b5e27241a +Subproject commit 45232bb4ad302647c6bb01163d002384a7cc5629 diff --git a/qtremoteobjects b/qtremoteobjects index 58107720..773dfaff 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5810772025b1819ef2e5ff8c214d89baed1e6f0f +Subproject commit 773dfaff3ea5518f142ab3b78493de3662380d2f diff --git a/qtrepotools b/qtrepotools index ecb869a1..8f06a503 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ecb869a1ed4cf30f25e9e5269000db0e0cdd2553 +Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 diff --git a/qtscript b/qtscript index bfaadab3..d51d7426 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit bfaadab30cb804204e90498437c360b037cc0b8d +Subproject commit d51d7426c7cdafaf1a6d3273080dad2396994866 diff --git a/qtscxml b/qtscxml index dc27453a..bc5e5b85 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dc27453a24ef18082f6f39dcf835092d0d32f913 +Subproject commit bc5e5b8516b45afd9c4219ee3eb51cff4a922a87 diff --git a/qtsensors b/qtsensors index c9e6509d..c5f0a61f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c9e6509d3b1191831e6f4c4cd41aa283f6dfe583 +Subproject commit c5f0a61fb2c1345f44c8f8fa76f78b34ed6e6ca9 diff --git a/qtserialbus b/qtserialbus index 42da962b..e006ff07 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 42da962b67b4af36a9930b447e0bbef417a646a0 +Subproject commit e006ff071d5f1609ca3d458b921814954322c24b diff --git a/qtserialport b/qtserialport index 553b62ba..f7e5700d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 553b62badf129ab36c1beee844a9b39492479e34 +Subproject commit f7e5700d6a44482f264ef603e0bf99b89694e6e4 diff --git a/qtspeech b/qtspeech index c47161c6..362b5595 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c47161c6c4c4b1d3252faf7f3088b526ba783513 +Subproject commit 362b559576c0a28876c6cdeb4796843e55afcffa diff --git a/qtsvg b/qtsvg index 92ae8746..09f83c7a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 92ae8746c412fbc87a97364eb4d86e470009f80d +Subproject commit 09f83c7a86b90b613e253acfc2746cbddf316025 diff --git a/qttools b/qttools index 676b08f9..7ce13b57 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 676b08f947098a3dd3d417a38631567157c4e757 +Subproject commit 7ce13b57310c4a0e3d1a2dc008fb40fa307b2e4b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cef398f8..92e7e856 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cef398f8c2176294dc492d7257c2b3705ec5a6ea +Subproject commit 92e7e8567d0a932b47353f59e4b62ea0d5c1aff8 diff --git a/qtwayland b/qtwayland index 1d18591d..2e9771ae 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1d18591d9e7ed9b3580e06c37be23bfde24bc30c +Subproject commit 2e9771ae81597d4c85d8dc103dbf55fe8870764d diff --git a/qtwebchannel b/qtwebchannel index 9f056f79..682f50e5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9f056f7902350106d992d43cb04a9e2f6b6b299b +Subproject commit 682f50e5669b2e2eed69ec588017d6b7b8f2a673 diff --git a/qtwebglplugin b/qtwebglplugin index 4ec76380..3b97ba6f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4ec76380e83b86a9202c4b24a1dc3452eedd937b +Subproject commit 3b97ba6f80c83a9d3827b9dbf85466b84d5a6506 diff --git a/qtwebsockets b/qtwebsockets index 9d3eb184..66ea748c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9d3eb184c72333a95ee8f9ee33bd51942271de64 +Subproject commit 66ea748c2ba1fa35c78c5d55742a982976b07435 diff --git a/qtwebview b/qtwebview index df93624c..360dd041 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit df93624cc31e9da29532eed1d86c9f172575355a +Subproject commit 360dd0413632535bb984e6e6bcb22ede1b401adf diff --git a/qtwinextras b/qtwinextras index 0d5ce87e..8d2de7d9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0d5ce87e1aeaed361c8d034e8329c0ceca62e42a +Subproject commit 8d2de7d9ee734719b4943fa3ea40b8e53aaa3809 diff --git a/qtx11extras b/qtx11extras index 57910a80..fae76c4a 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 57910a8015e05328a9ad412b4d76cc2137a853f3 +Subproject commit fae76c4ae15fdc282a2b0f17bd32f3fdb223d80c diff --git a/qtxmlpatterns b/qtxmlpatterns index 95b629b3..a7ffa65d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 95b629b30380be3de92158ad55ba266452d3c945 +Subproject commit a7ffa65d67f1f506043ae0faf914817328638e31 -- cgit v1.2.3 From ac8b28db576356431a1a414b2c08b2eb09c8b898 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 Apr 2020 09:47:55 +0200 Subject: Update submodules on '5.14' in qt/qt5 Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtmultimedia b/qtmultimedia index 50b0a867..c3b9a8a6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 50b0a8670ba0ff460115c3ac113c19f17d36246e +Subproject commit c3b9a8a6bc2a3dc3907f1cc349a7279916b599a4 -- cgit v1.2.3 From 5b018f96af70639c0df261be425b988388bb85a1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 24 Apr 2020 15:33:55 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 50390aef..37735f11 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 50390aefe6f990aa2b959efd2090b59fef091912 +Subproject commit 37735f11f9437b916b194cfd48c452c7c70682f8 diff --git a/qtbase b/qtbase index e0a78bf4..89dc1a18 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e0a78bf4501c3102578d2de02c95418fa5bb4611 +Subproject commit 89dc1a1865dd8ed277b88a53262b79a93c2ba8dc diff --git a/qtdeclarative b/qtdeclarative index 7513e896..7c9a5490 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7513e896726f0dfc6e290b638c83ae45e4deb88a +Subproject commit 7c9a54907f44b7e30ceac1975edcfa7920ffafd8 diff --git a/qttools b/qttools index b3cdd63d..dccea132 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e +Subproject commit dccea132cb8bdf3e9a933a64e24b90e46536e3d4 diff --git a/qtwayland b/qtwayland index 83fdd401..28e7d940 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 83fdd4018d05d658787c0cd49fdb766bff101234 +Subproject commit 28e7d940c42c47cf039522709883ae3de9f4fb88 diff --git a/qtwebengine b/qtwebengine index 9e56f570..75412200 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9e56f570e31a0ef18e544bb21dfddebfe43ec2d0 +Subproject commit 75412200db05ddc5ee2b9aea367b580d8b0c438e -- cgit v1.2.3 From 230e99400c92fb119fe0072b321e6af25d9f3204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 Apr 2020 23:45:53 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index 7c9a5490..1dcd4ff0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c9a54907f44b7e30ceac1975edcfa7920ffafd8 +Subproject commit 1dcd4ff086f55392f7d194e2e4a9e4cff599d0f6 -- cgit v1.2.3 From 20668c9233846b48409b1d983847b805e130e328 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 26 Apr 2020 23:45:47 +0200 Subject: Update submodules on '5.15' in qt/qt5 Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2 Reviewed-by: Qt Submodule Update Bot --- qtqa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtqa b/qtqa index ff87df77..a03bac72 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 +Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 -- cgit v1.2.3 From 4aa9c4df116257103eba8576c61d6d5c412f9a08 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 23 Mar 2020 11:14:34 +0100 Subject: CMake: Enable CMake builds for qtquick3d Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9 Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtquick3d.yaml | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 coin/platform_configs/qtquick3d.yaml diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml new file mode 100644 index 00000000..eff1e627 --- /dev/null +++ b/coin/platform_configs/qtquick3d.yaml @@ -0,0 +1,38 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.0-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] -- cgit v1.2.3 From 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Apr 2020 14:53:47 +0300 Subject: Provisioning: Add sleep before killing gpg-agent in msys installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3691 Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920 Reviewed-by: Simo Fält --- coin/provisioning/common/windows/install-msys2.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index b26df151..784b09dc 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma Start-Sleep -s 30 cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. +# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. +Start-Sleep -s 180 if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } -- cgit v1.2.3 From 3265e93168126a29f004d6f801365de9e44255f9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 27 Apr 2020 10:10:08 +0200 Subject: Try to build qtbase with cmake against Yocto This adds the basic armv7 configuration and passes through two additional variables for use in the build instructions: * QT_YOCTO_ENVSETUP points to the environment-setup script that the Yocto SDK expects to be sourced before building against the target sysroot. * QT_CMAKE_DIR points to the directory that contains our cmake installation. Since the environment-setup prepends the Yocto host bin dir to the PATH, we'd end up picking the wrong cmake. Also the choice of system Harfbuzz is disabled as Qt does not build against the version shipping in Yocto. Change-Id: I8d657e773143c4db0e2437d029d62372f7b7e638 Reviewed-by: Alexandru Croitor --- coin/platform_configs/qtbase.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index f2b8073d..57978a84 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -7,6 +7,14 @@ Configurations: Compiler: 'GCC' Features: ['DisableTests', 'UseLegacyInstructions'] 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/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-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: 'armv7' + Compiler: 'GCC' + Features: ['DisableTests'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.0-rc2/bin"] + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.3 From ff4a1141f26e66934d043d65881f1cf2aaecc788 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Apr 2020 15:44:51 +0200 Subject: Update submodules on 'dev' in qt/qt5 Change-Id: I96f194ffeecc40522b5ed69b0bd2d2e03045cfd9 Reviewed-by: Liang Qi --- qt5compat | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt5compat b/qt5compat index 53caea8e..bbbbbf2c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 53caea8e1c9b88f63b9e8ec0aa67abb72f0e9922 +Subproject commit bbbbbf2c11097ec0bdf0f17d78ad594651ad3860 diff --git a/qtandroidextras b/qtandroidextras index 1d2b8ff2..71ebb8db 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1d2b8ff200c49ce76948407548072f4493f71d6b +Subproject commit 71ebb8db74baa9d9d659be5e367b38dce80e8a9a diff --git a/qtbase b/qtbase index 5422fb79..4ba25a09 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5422fb79486a1818d6355d75f019fe63120a43d0 +Subproject commit 4ba25a092065a6422510a9f4afa4fbbabeda686c diff --git a/qtdeclarative b/qtdeclarative index 399ebb56..1465ca26 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 399ebb5635efc897d29efba90f92f931843b266a +Subproject commit 1465ca26c62605634afdf7b2c9e8ecbfc2397dae diff --git a/qtdoc b/qtdoc index 8e2ad476..758a1c15 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8e2ad476faacf8c4a173fbcabf094f5c92db1d09 +Subproject commit 758a1c15ca2b9034ea51fa808763b2eb3b0b61ac diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 40334264..74c81763 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 403342641c4872eac378052a174523a1966553cb +Subproject commit 74c81763391f1292482d46d87ea76f39c9064ee3 diff --git a/qtimageformats b/qtimageformats index 7d02c171..c1f396c7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7d02c1718dc89435950aae76abe5dc09b82e66f4 +Subproject commit c1f396c7cfe848604ef7c738111e33db7829ed6f diff --git a/qtnetworkauth b/qtnetworkauth index 867e0f43..20a90737 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 867e0f4318693ece4d52791ce99c4bb85737c097 +Subproject commit 20a907375e08e44e114ccd9daec37be466a1c8f2 diff --git a/qtqa b/qtqa index 930a856e..a03bac72 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a +Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 diff --git a/qtquick3d b/qtquick3d index c7cc7b0a..00582106 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c7cc7b0a25f5d2bb7748b098cf7d9c5a12137599 +Subproject commit 00582106a2d286bf9df52a1d795d176833791e83 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b60edab1..885d0659 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b60edab10cd5e5cffde22382eccf3d1c21e258c9 +Subproject commit 885d065902422f82d474e6a8cae43e1b3e4d94d0 diff --git a/qtquicktimeline b/qtquicktimeline index 10cf2261..ec6bf0d7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 10cf2261cddf9ddf3f51202d02dd2c325d1e0837 +Subproject commit ec6bf0d7edeb93ddcc10c18ae479135eb700de0a diff --git a/qtrepotools b/qtrepotools index d6e8ca40..8f06a503 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 +Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 diff --git a/qtshadertools b/qtshadertools index ca11f0a4..7305d0c8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ca11f0a4a6f499fdad7f667bd23db064653e4ffc +Subproject commit 7305d0c82df5af38e4a4f26731391b923e281d38 diff --git a/qtsvg b/qtsvg index f1aae3f2..f759ab49 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f1aae3f2ec16075f02331fe3c7dc6eda1300b46f +Subproject commit f759ab4905879c19ae094d702d5e66ab3ef06479 diff --git a/qttools b/qttools index ae93fab0..e633ec59 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ae93fab03d3192f1ed32471a58f58e34f757c1cd +Subproject commit e633ec59893e2f4a25330be8a9ece4a943cfcef9 diff --git a/qttranslations b/qttranslations index a85b7a95..306dea76 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a85b7a95f86c0c95604ea415a656e2e1e030eee7 +Subproject commit 306dea7670920719b54350066758da8320743ebe diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 88313b01..861d03cd 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 88313b011ddf01a84d351f4a497f91a8d3800d1b +Subproject commit 861d03cd8f419a8cfae5c6d799863f7a625d9bb2 diff --git a/qtwayland b/qtwayland index e026ae41..5d25a0c2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e026ae41e2aea618b6f6dae94c5e260fb4e90ce8 +Subproject commit 5d25a0c233b1e47cf53d05e90fc7156f8c65d170 diff --git a/qtwebsockets b/qtwebsockets index 87ed789e..d6790a43 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 87ed789eeabaded6af1380182bf078bd516f656c +Subproject commit d6790a4330256fbef578274fe3e5b0547b55c9d0 -- cgit v1.2.3 From 4dace062975fabc4e66315c40885c56b1e39ded9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 28 Apr 2020 11:59:44 +0200 Subject: CMake: Enable a MinGW 7.3 CMake qtbase configuration It should be a developer build, but due to some features that are not ported in src/gui/configure.cmake (directwrite) there are compilation errors due to unused arguments in static bool QWindowsFontDatabaseBase::init(QSharedPointer) in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp So it's not a developer build for now. Task-number: QTBUG-75578 Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0 Reviewed-by: Simon Hausmann --- coin/platform_configs/qtbase.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index f1eaf768..8724b2ac 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -69,3 +69,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw73' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW730}}\bin;{{.Env.Path}}'] -- cgit v1.2.3 From 9f4a39356a95d1c4606938c1c50b56a6204366d4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 May 2020 16:53:22 +0200 Subject: CMake: Switch host macOS configurations to framework release builds Also include debug info. This is the equivalent of qmake's --release --framework --force-debug-info --separate-debug-info Change-Id: I2778b4998890146c82552f9c721a48174a764839 Reviewed-by: Simon Hausmann --- coin/platform_configs/qt5compat.yaml | 2 +- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtdeclarative.yaml | 2 +- coin/platform_configs/qtgraphicaleffects.yaml | 2 +- coin/platform_configs/qtimageformats.yaml | 2 +- coin/platform_configs/qtnetworkauth.yaml | 2 +- coin/platform_configs/qtquick3d.yaml | 2 +- coin/platform_configs/qtquickcontrols2.yaml | 2 +- coin/platform_configs/qtshadertools.yaml | 2 +- coin/platform_configs/qtsvg.yaml | 2 +- coin/platform_configs/qttools.yaml | 2 +- coin/platform_configs/qtwayland.yaml | 2 +- coin/platform_configs/qtwebsockets.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 8724b2ac..c1b997ba 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -44,7 +44,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index ee2cc847..d085e456 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -44,7 +44,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtgraphicaleffects.yaml b/coin/platform_configs/qtgraphicaleffects.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtgraphicaleffects.yaml +++ b/coin/platform_configs/qtgraphicaleffects.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtquickcontrols2.yaml +++ b/coin/platform_configs/qtquickcontrols2.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qttools.yaml b/coin/platform_configs/qttools.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qttools.yaml +++ b/coin/platform_configs/qttools.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index 69268ba0..e0dd1697 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' -- cgit v1.2.3 From 3652f77aa34d5d5fde8981713ca3f427e241bb71 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 7 May 2020 14:56:35 +0200 Subject: Provisioning: Set macOS locale to "en_US.UTF-8" The 419f42903154489e2dace8d1eba183036275448b commit in qtbase introduced a regression where the tst_fusion test in qtqtuickcontrols2 hits a deadlock while trying to print a warning about a non-UTF-8 locale. The warning is due to the fact that the agent executed in Coin's VM does not have an explicit locale set, and thus it defaults to "C". There is no explicit locale set in any .bashrc (or similar files), and neither in any launchd configuration (because the agent is executed at macOS startup via launchd). The deadlock is due to trying to acquire the same lock twice while trying to write output to stdout. The test only deadlocks on CMake configurations, and not qmake configurations, because Coin has a hardcoded instruction to set the locale to UTF-8 when running qmake tests. Until the deadlock situation is addressed in another change, the issue can be fixed by setting the macOS configuration locale to UTF-8 explicitly, by assigning the LANG environment variable into ~/.bashrc at provisioning time, like we do with other environment variables like PATH. Fixes: COIN-578 Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0 Reviewed-by: Edward Welbourne --- coin/provisioning/common/macos/set-locale.sh | 41 ++++++++++++++++++++++ .../qtci-macos-10.13-x86_64/97-set-locale.sh | 6 ++++ .../qtci-macos-10.14-x86_64/97-set-locale.sh | 6 ++++ 3 files changed, 53 insertions(+) create mode 100755 coin/provisioning/common/macos/set-locale.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/97-set-locale.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh diff --git a/coin/provisioning/common/macos/set-locale.sh b/coin/provisioning/common/macos/set-locale.sh new file mode 100755 index 00000000..b4a84522 --- /dev/null +++ b/coin/provisioning/common/macos/set-locale.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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 sets the macOS locale to UTF-8 +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +SetEnvVar "LANG" "en_US.UTF-8" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-10.13-x86_64/97-set-locale.sh new file mode 100755 index 00000000..e34b7381 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/97-set-locale.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/set-locale.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh new file mode 100755 index 00000000..e34b7381 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/set-locale.sh -- cgit v1.2.3 From a8d3591327c3f5d3c1e349e752b2c43f7037fca9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 7 May 2020 21:09:39 +0200 Subject: Temporarily ignore qtnetworkauth Task-number: QTBUG-84071 Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f Reviewed-by: Alexandru Croitor --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6da4e828..637bd457 100644 --- a/.gitmodules +++ b/.gitmodules @@ -284,7 +284,7 @@ path = qtnetworkauth url = ../qtnetworkauth.git branch = dev - status = addon + status = ignore [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.3 From 29c9ba1835c4a26d17375a367374c505a1f59f15 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 May 2020 09:43:06 +0200 Subject: CMake: Switch to MinGW 8.1 configuration for the qtbase CMake build Change-Id: I974d34a33370ece9f9e240ba6e5106cc50d8bf84 Reviewed-by: Cristian Adam --- coin/platform_configs/qtbase.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index c1b997ba..e3811c86 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -71,6 +71,6 @@ Configurations: Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' - Environment variables: ['Path={{.Env.MINGW730}}\bin;{{.Env.Path}}'] + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3 From e4d60dd1171531baa52284590537e9e7ba7c2d4e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 May 2020 09:56:00 +0200 Subject: CMake: Enable CMake builds for qtvirtualkeyboard Task-number: QTBUG-78185 Change-Id: Ie8a120aa3425edf6ae18f4a43dcd3f6aa697cd9f Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtvirtualkeyboard.yaml | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 coin/platform_configs/qtvirtualkeyboard.yaml diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml new file mode 100644 index 00000000..e0dd1697 --- /dev/null +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -0,0 +1,38 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] -- cgit v1.2.3