From 569fd1dabc47dccd80331d4f380eae811fd07447 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 11 Nov 2019 14:24:36 +0200 Subject: [PATCH 01/18] Provisioning: Install pre-builded openssl for Windows 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f90938c4..269771c7 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,10 +43,10 @@ # nmake install -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" -$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" +$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip Verify-Checksum $zip $sha1 @@ -55,6 +55,8 @@ $installFolder = "C:\openssl" Extract-7Zip $zip "C:\" Remove-Item -Path $zip +Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl + Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" From 6cc2215b8ce6da477cf23f01ff5b88c0d12c2b88 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:09:12 +0100 Subject: [PATCH 02/18] DownloadURL last argument (targetFile) is now optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index ac1fd971..5bafc33d 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -89,7 +89,14 @@ DownloadURL () { url=$1 url2=$2 expectedHash=$3 - targetFile=$4 + # Optional argument $4: destination filename + if [ x"$4" = x ] + then + # defaults to the last component of $url + targetFile=$(echo $url | sed 's|^.*/||') + else + targetFile=$4 + fi if VerifyHash "$targetFile" "$expectedHash" then From fafd3d655d4ebb303825cb40203ecf39f3b0e578 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 15:37:32 +0100 Subject: [PATCH 03/18] Fix cache URL for telegraf windows package Fixes: QTQAINFRA-3340 Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install_telegraf.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 index 258c6c59..fee550b1 100644 --- a/coin/provisioning/common/windows/install_telegraf.ps1 +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -49,7 +49,7 @@ if (Is64BitWinHost) { $filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename $url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename $tempfile = "C:\Windows\Temp\" + $filename From a270bcdb6beb34d7590378899805391cfcfe7091 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:45:45 +0100 Subject: [PATCH 04/18] Docker installation: do not depend on external repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 37 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 1d9e8419..127239d1 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -35,18 +35,37 @@ set -ex -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y + +. $(dirname "$0")/../../common/unix/DownloadURL.sh + + +localRepo=http://ci-files01-hki.intra.qt.io/input/docker +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 + +echo ' + f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb + ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb + 09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb +' \ + | xargs -n2 | while read sha f +do + DownloadURL $localRepo/$f $upstreamRepo/$f $sha +done + +sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb + sudo usermod -a -G docker $USER sudo docker info -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + $localRepo/$f \ + https://github.com/docker/compose/releases/download/1.24.1/$f \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +rm ./docker-compose* # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y From 33d254781788ae145075da53534741587be036a5 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 17:30:46 +0100 Subject: [PATCH 05/18] Keep debug trace off to avoid polluting the logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 127239d1..08303700 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -ex +set -e . $(dirname "$0")/../../common/unix/DownloadURL.sh From ef7481b9cd514d0e3d73c5211193d1d100acfe74 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 13 Nov 2019 19:55:51 +0100 Subject: [PATCH 06/18] Workaround broken local apt mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 4 ++++ 1 file changed, 4 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 e7cf5c3d..89b1eb7f 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 @@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse From 4728ffb6200846145e9bfb5d0d6713698921ffc7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Nov 2019 21:02:03 +0100 Subject: [PATCH 07/18] Update submodules on '5.13' in qt/qt5 Change-Id: I7ba7a20377d5fbe2b390ec1aeed82e74eb974eba Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 51b09ca0..b33b615f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 51b09ca0b2506f3cdfd025511a68888ed959b6d5 +Subproject commit b33b615f4a4ac4d61bbce320783d5cca6edd91d1 diff --git a/qtbase b/qtbase index 39ed657b..30f4ca4e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 39ed657b6393c850735857e367303800f1a04413 +Subproject commit 30f4ca4e4fbc1d8cf86808dbeb00ec3c046f6c1c diff --git a/qtdeclarative b/qtdeclarative index 15d1b173..c89f7a22 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 15d1b173d030f5ae5ca72f511d33c80979503268 +Subproject commit c89f7a221b7c31a0a4e1b0eed2e91d7633f4eab2 diff --git a/qtdoc b/qtdoc index 62dbc6b4..fe230a19 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 62dbc6b4a1608bf75c00b90b6da60785c2e8fc89 +Subproject commit fe230a199306888f11ac62e8a056f64048943906 diff --git a/qtimageformats b/qtimageformats index 9fe1f2e9..ba1fb21b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9fe1f2e918d39031852805f1add23125c061d3c3 +Subproject commit ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400 diff --git a/qtmultimedia b/qtmultimedia index b64bdf32..f9a57682 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b64bdf32ce10b039e8d7b1be18d001e89f315615 +Subproject commit f9a576826c0d770aaae8aadbedaf83e1c0b72e0a diff --git a/qtqa b/qtqa index 62a653d3..b9a30637 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d +Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5c1aa494..0622cb60 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5c1aa494e95b2945500e3c3e62240dd60e7190d6 +Subproject commit 0622cb603869484c93acf6369965ec2eabd9ef6f diff --git a/qttranslations b/qttranslations index 36022c8e..828c7105 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 36022c8e9263c1940710cd214965979e9bd8a036 +Subproject commit 828c710556718257bbfd52fbcd4bdf55dc567b08 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 28596bc3..730dba4a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 28596bc340ac335a2759099c83db30d5c761d151 +Subproject commit 730dba4a4741b18b94377ff94d894c3245dd63ef diff --git a/qtwayland b/qtwayland index 62e959ea..2493c8b6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 62e959eaa707a163daca69a42c733bbd272d41d6 +Subproject commit 2493c8b6600f2617848007ee9592c71361b432fe diff --git a/qtwebengine b/qtwebengine index 5e4487c2..6e79d033 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5e4487c2d9c72c54269db5fe8f333c75479ccb5f +Subproject commit 6e79d033a30f9d56b72a5aa4cc9a02cf656e2fe5 From 40cca42c393577dbf85d4752eea50da207380907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 13 Nov 2019 16:27:53 +0100 Subject: [PATCH 08/18] Use macOS 10.14 to build iOS/tvOS/watchOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows us to (as a follow-up) use Xcode 11. Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1177086a..1b99b7da 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -106,21 +106,21 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'TvOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'WatchOS_ANY' Target arch: 'multi' Compiler: 'Clang' From 6bf7a970e703aa3d88ebfb53f7ba2554faebe489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 13 Nov 2019 17:53:45 +0100 Subject: [PATCH 09/18] Use Xcode 11 on macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTQAINFRA-3261 Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.14-x86_64/21-install-commandlinetools.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index 2ee4dedf..f0ef3a96 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.2.1.tar.gz 11.2.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh index 09055ee6..241c4c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -38,10 +38,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="10.2.1" -packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +version="11.2" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" -sha1="18fea89bb743107aee372a212be608d6e35fdecf" +sha1="04f288e0dce69ddbce52ea707f978afcbf6be107" InstallCommandLineTools $url $url $sha1 $packageName $version From 5d5ef9c32b87740bb0bdb0c6265fd15f96361a11 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 7 Nov 2019 13:41:51 +0200 Subject: [PATCH 10/18] Enable dSYM files for release builds in macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same flag is used in windows and linux ones and it seems that is needed to enable dSYM files for release builds Task-number: QTBUG-3934 Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83 Reviewed-by: Tor Arne Vestbø --- 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 1b99b7da..c703555c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,12 +94,12 @@ Configurations: 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 -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' From d8eaed9b0987c32ad62b92565933bd80a83e5f92 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 5 Nov 2019 12:25:03 +0200 Subject: [PATCH 11/18] Provisioning: Update Android NDK version to r20 for macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3337 Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70 Reviewed-by: Johanna Äijälä --- coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version From edb5ebfb7e9cc47c8454b55a8964e8121ef838ea Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Nov 2019 13:38:44 +0100 Subject: [PATCH 12/18] Update submodules on '5.14' in qt/qt5 Change-Id: Ia052f103935e8451e10258315370009b9b24f596 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 906f8a62..31d3ebed 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 906f8a62f89a7ce2343a155e6db62616e66dc14b +Subproject commit 31d3ebed75387b09645fe3f1d36e3b30f686fce3 diff --git a/qtactiveqt b/qtactiveqt index 95f41d5f..3b07b8b2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 95f41d5f24dab973da0a96641e556fac7ae3fa42 +Subproject commit 3b07b8b2f33b0888e20313f52425012b980831c9 diff --git a/qtandroidextras b/qtandroidextras index 2914af23..57aacdd6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2914af23f0691bc04c1bd66faf79b403e68ff8e4 +Subproject commit 57aacdd654a7dec2f8ff412f4f3705d0bd50a0a9 diff --git a/qtbase b/qtbase index d1c6f7e5..54f5b897 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1c6f7e5a2e0ee6c50bbf0668e44200bd8469a09 +Subproject commit 54f5b8975055f1d48c74efab085acd6338aa1e3c diff --git a/qtcharts b/qtcharts index de7d5543..57b67d63 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit de7d5543ae093b84a6526cad0d8c56fc12f7526f +Subproject commit 57b67d631dee93f6473786f38504da32fb0bb6b8 diff --git a/qtconnectivity b/qtconnectivity index 17621645..355f09ec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 176216459d84c59bf0cff26203928cfc144f164e +Subproject commit 355f09eccc5ceba421e8c522e04cb7be72fa0a75 diff --git a/qtdeclarative b/qtdeclarative index e87ecaf5..35fdf3a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e87ecaf55291ac38c705dea7eaeb7c58ad0e3284 +Subproject commit 35fdf3a7b77a79806d0b5d9632b5066e3618adf5 diff --git a/qtdoc b/qtdoc index bcb2f180..2f81a81a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bcb2f180295962061b0eefcf8010120941200d2a +Subproject commit 2f81a81aac5b6f47e3d40974912917473171597d diff --git a/qtimageformats b/qtimageformats index 8ca5b34c..3d157f97 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 +Subproject commit 3d157f9773a2db1a3096a86e5170ace975646ca3 diff --git a/qtlocation b/qtlocation index 0771fa5d..cd7edab9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0771fa5d6476f51c1d2c9874be4958e4b37d10e3 +Subproject commit cd7edab940934fe8b100172e3e62e7eea5c354e5 diff --git a/qtmultimedia b/qtmultimedia index a045c989..49bf444b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a045c989e15feda1201e81d8c2a7a403c33ad6da +Subproject commit 49bf444b44dac10602af0af862f0951835ea5895 diff --git a/qtqa b/qtqa index 62a653d3..b9a30637 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d +Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 diff --git a/qtquick3d b/qtquick3d index 8bd8254e..67458dbc 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8bd8254ee1f3f1f578bb523b43fd949fc22fefd7 +Subproject commit 67458dbc14f3c319976f62a781ce88044fc3e8b3 diff --git a/qtquickcontrols b/qtquickcontrols index 3432dd2a..5d76ced0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3432dd2a5ffb19144dae39cb1c728b44a48f04f5 +Subproject commit 5d76ced033cf1b2a1466a1b1b2a3a4f1102fab3f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc62583e..2193e993 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc62583e8e1f864b8a22fbe79f9fe25ca3a4e9dc +Subproject commit 2193e9938e98af39a16f5035789c555f2574020b diff --git a/qtremoteobjects b/qtremoteobjects index ac6b0b0d..419455bf 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ac6b0b0d1ca9fe3f6a61e078db9a30eb5dad6da0 +Subproject commit 419455bfe6e51601504d7c2fa5a2a9dff9c20851 diff --git a/qtserialbus b/qtserialbus index 15c618da..545494c6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 15c618da80a71d0f5c33cdade6535f43eb852363 +Subproject commit 545494c6e7c2441f7fc8c6b7e337189461938b00 diff --git a/qtserialport b/qtserialport index 09fa8225..d4dc8988 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 09fa8225d525b12ba22234a59452decaf987fb8a +Subproject commit d4dc8988c5cfc6e0080e9ef17f8393a6a06cbb98 diff --git a/qtsvg b/qtsvg index 9aeb3523..e489a325 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9aeb3523a7fc521b725be106b1521335061c43b3 +Subproject commit e489a325769d295ee3b3948d98f5d07814dffd97 diff --git a/qttools b/qttools index c962370b..2b6c9031 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c962370b3db644bb05c410b2536552466b4eac86 +Subproject commit 2b6c90317b6bc5f94ca0dc14a3a1467aa8019b17 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0f6d99c6..6547842b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0f6d99c67b415169153d90844066226ba4d343d2 +Subproject commit 6547842b5ec6f3f13dc0d9fec6c8e4d167bfb2ce diff --git a/qtwayland b/qtwayland index 4cdfa555..ca8a6e6e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cdfa55502704d13f3d0cc1f2feccd8807e0c1d4 +Subproject commit ca8a6e6ee1c2439dbe439244b61f86cf062f88d5 diff --git a/qtwebchannel b/qtwebchannel index 1f6c72df..48ceec6d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1f6c72df8b33741dc798042dd8c2e75f3af46232 +Subproject commit 48ceec6ddb790730a23b5bee847bea5273300103 diff --git a/qtwebengine b/qtwebengine index 296469f8..ce72a40e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 296469f8ecef1f4d10cf8c24237fe9397b41f306 +Subproject commit ce72a40e91095dd5e1e46713fb94de493ee48d39 diff --git a/qtwebsockets b/qtwebsockets index 88f408f9..5b34b19b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 88f408f90d760df73c431336ab318b3af66b9572 +Subproject commit 5b34b19b0a37624a3f5846a949112929ef5feeeb diff --git a/qtx11extras b/qtx11extras index b7328240..8dae1423 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b732824096cd3cf31f7a374aa3b92fa934ff9ecd +Subproject commit 8dae14239247281ce36a9e92308a506f149574db diff --git a/qtxmlpatterns b/qtxmlpatterns index 8bb4665c..9e7745d7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8bb4665cccbe0b00cf234917e4fd59394705f46f +Subproject commit 9e7745d7e283570ca8504909d20c39d3aca18cf7 From 601a9d39b2b7b6e3fd0b3504e5c5e460e89c64c2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 5 Aug 2019 15:48:20 +0300 Subject: [PATCH 13/18] Provisioning: Install python modules needed by packaging Needed by packaging scripts Task-number: COIN-214 Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb Reviewed-by: Iikka Eklund --- .../common/unix/python_modules.sh | 38 ++++++++++++++++++ .../90-python-modules.sh | 39 +++++++++++++++++++ .../90-python-modules.sh | 7 ++++ .../90-python-modules.ps1 | 3 ++ 4 files changed, 87 insertions(+) create mode 100755 coin/provisioning/common/unix/python_modules.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh new file mode 100755 index 00000000..dbf26a85 --- /dev/null +++ b/coin/provisioning/common/unix/python_modules.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# needed by packaging scripts +sudo pip3 install bs4 +sudo pip3 install sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a3fc7b9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/python-modules.sh +source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a2cbf64 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/python_modules.sh" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 new file mode 100644 index 00000000..3646d826 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 @@ -0,0 +1,3 @@ +# Needed by packaging scripts +C:\Python36\Scripts\pip3 install bs4 +C:\Python36\Scripts\pip3 install sh From 0335e9c4e5fa697b03a4777728e1cedbfd78fd79 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 8 Oct 2019 15:25:04 +0300 Subject: [PATCH 14/18] Provisioning: Remove shell scripts under windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf Reviewed-by: Tony Sarajärvi --- .../common/windows/09-install-openssl.sh | 6 --- .../windows/50-openssl_for_android_linux.sh | 39 ------------------- 2 files changed, 45 deletions(-) delete mode 100755 coin/provisioning/common/windows/09-install-openssl.sh delete mode 100755 coin/provisioning/common/windows/50-openssl_for_android_linux.sh diff --git a/coin/provisioning/common/windows/09-install-openssl.sh b/coin/provisioning/common/windows/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/common/windows/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/common/windows/50-openssl_for_android_linux.sh b/coin/provisioning/common/windows/50-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/common/windows/50-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" From dcfef7226fb54288858d234764f15582c77f5b05 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Nov 2019 09:09:21 +0200 Subject: [PATCH 15/18] Provisioning: Change JDK script to use 'Remove' function from helpers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3369 Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/install-jdk.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 0c548e63..ce1abdd5 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -68,8 +68,7 @@ try { Verify-Checksum $javaPackage $sha1 Run-Executable "$javaPackage" "/s SPONSORS=0" -Write-Host "Cleaning $javaPackage.." -Remove-Item -Recurse -Force -Path "$javaPackage" +Remove "$javaPackage" Write-Host "Remove Java update from startup" reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f From 08ded9e2f87c3313354e578c3eefb6d95c2385e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Wed, 16 Oct 2019 11:51:00 +0300 Subject: [PATCH 16/18] Provisioning: update Squish Update with custom build of Squish to be able to launch Qt5.14 applications in RTA tests. Change-Id: Ic420656852ae885b057de937baabf01135526764 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/unix/squishInstall.sh | 8 ++++---- coin/provisioning/common/windows/squishInstall.ps1 | 10 +++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index f1b5e6b5..24a4d507 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,14 +38,14 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.4.3" +version="6.5" # Branch version without dot -qtBranch="512x" +qtBranch="513x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-$version-qt$qtBranch-linux64.run" +squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" if uname -a |grep -q Darwin; then - squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" + squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 2cc45785..f8d600d7 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,10 +38,10 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.4.3" +$version = "6.5" # Qt branch without dot (*.*) -$qtBranch = "512x" +$qtBranch = "513x" # So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. @@ -62,11 +62,7 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 - if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { - $qtBranch = "511x" - } - $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" + $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" From 9cf8af52484ea5e80cec9a56c2d9e841bb44184e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 20 Nov 2019 15:28:30 +0200 Subject: [PATCH 17/18] Provisioning: Remove sudo when installing pip packages for Qt user There is no need to install as sudo for qt user. Using sudo will change the cache dir's permissions preventing us from installing anything with pip as normal user. Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e Reviewed-by: Friedemann Kleint --- coin/provisioning/common/unix/python_modules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh index dbf26a85..89adbd5c 100755 --- a/coin/provisioning/common/unix/python_modules.sh +++ b/coin/provisioning/common/unix/python_modules.sh @@ -34,5 +34,5 @@ ############################################################################# # needed by packaging scripts -sudo pip3 install bs4 -sudo pip3 install sh +pip3 install bs4 +pip3 install sh From f064a5b9d2ec45187157adb6b2194e564fbaca8b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 26 Nov 2019 08:11:17 +0100 Subject: [PATCH 18/18] Update submodules on '5.14' in qt/qt5 Change-Id: I75cd18c8c09c47c2eee8dd0629d1cccb3b5838e0 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 54f5b897..84892e5e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 54f5b8975055f1d48c74efab085acd6338aa1e3c +Subproject commit 84892e5e69e7e44cb1fb77b2ba2338114554a7d2 diff --git a/qtdeclarative b/qtdeclarative index 35fdf3a7..92481660 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35fdf3a7b77a79806d0b5d9632b5066e3618adf5 +Subproject commit 9248166095b1e3383a43f106219e888b6d43b7d6 diff --git a/qtdoc b/qtdoc index 2f81a81a..1e27737f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2f81a81aac5b6f47e3d40974912917473171597d +Subproject commit 1e27737f9e341c6d53dd8a92c2505996c96e3b7d diff --git a/qtqa b/qtqa index b9a30637..0f6a737c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 +Subproject commit 0f6a737ca798ae9c8e0c634715c5cb66681a278a diff --git a/qtquick3d b/qtquick3d index 67458dbc..2c7d2d46 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 67458dbc14f3c319976f62a781ce88044fc3e8b3 +Subproject commit 2c7d2d46bd4ac2cc203be586a760a8f9bc2ac69e diff --git a/qtquickcontrols b/qtquickcontrols index 5d76ced0..dfd79afd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5d76ced033cf1b2a1466a1b1b2a3a4f1102fab3f +Subproject commit dfd79afda5faf9e732f83715e11dc7aaf5cce164 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2193e993..f9877da4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2193e9938e98af39a16f5035789c555f2574020b +Subproject commit f9877da406ad96d82becb15b6eef9b723b8807e3 diff --git a/qtquicktimeline b/qtquicktimeline index a5c44aee..02b8928d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a5c44aee2d92ed607ce1fc38910d35bd2df5ce9c +Subproject commit 02b8928d42398f963f98e2fa526d14f04f3db429 diff --git a/qtrepotools b/qtrepotools index 0028759f..a3d6e9d3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 +Subproject commit a3d6e9d3965ae4d4f97986982b851ef30d091fd5 diff --git a/qtserialbus b/qtserialbus index 545494c6..e333d015 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 545494c6e7c2441f7fc8c6b7e337189461938b00 +Subproject commit e333d015458b579768ca229918a3ed426f0e4029 diff --git a/qttools b/qttools index 2b6c9031..8437ead5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b6c90317b6bc5f94ca0dc14a3a1467aa8019b17 +Subproject commit 8437ead59e73007f05346068ff0979352488a218 diff --git a/qtwayland b/qtwayland index ca8a6e6e..c327759b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ca8a6e6ee1c2439dbe439244b61f86cf062f88d5 +Subproject commit c327759b8f1c8fcb6ec70b4266092a38fd1375f6 diff --git a/qtwebchannel b/qtwebchannel index 48ceec6d..b2685b64 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 48ceec6ddb790730a23b5bee847bea5273300103 +Subproject commit b2685b64d1f2fef2ef1f3f3542379fb8f052d113 diff --git a/qtwebengine b/qtwebengine index ce72a40e..aca2a6df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ce72a40e91095dd5e1e46713fb94de493ee48d39 +Subproject commit aca2a6df402d6454c7bbe8b0e9816645fcec8342 diff --git a/qtwebglplugin b/qtwebglplugin index 63a47ff1..ef0f5f5e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 63a47ff1f83c64e6865edd61657ad1d636fcae23 +Subproject commit ef0f5f5ed8cdb6dd70f728fd1873158785f43d27