From 2306cb69c8a76ebf79f6d1fb4216fa8fdfc03f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 12 Sep 2018 10:17:49 +0300 Subject: [PATCH 01/27] Provisioning: Windows: Disable automatic defragmentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatic disk defragmentation is enabled by default on Windows machines. It should be disabled to save some time. Task-number: QTQAINFRA-2217 Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-defragment.ps1 | 34 +++++++++++++++++++ .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + 7 files changed, 40 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 new file mode 100644 index 00000000..876938f8 --- /dev/null +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -0,0 +1,34 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" From c231323b74e20450e0843a4d8452b6a86b4c12c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Jan 2019 21:23:22 +0100 Subject: [PATCH 02/27] Update submodules on '5.12' in qt5 Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71 Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index f05cc414..9636a43a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f05cc4144e06fd06eed12a3e427eb49e7ad1cf85 +Subproject commit 9636a43abcf98dede8b267f557b728e99f0d56cd diff --git a/qtlocation b/qtlocation index 1e24cec7..04ce8e7f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1e24cec7e3ebf5f62f5440d848caf6cd9db1e456 +Subproject commit 04ce8e7f5b7476a08d4f85287e5afb9976ec2d8c diff --git a/qtwayland b/qtwayland index 09b6fcf3..00c0bad3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 09b6fcf3ec501cb94d89833745264a16c2a74209 +Subproject commit 00c0bad3184e32ff0b1dd799b7ef121eaa737c0d diff --git a/qtwebengine b/qtwebengine index 540ca045..d8eaae80 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 540ca045f883d9961a982573a6c30cb7256b7d2c +Subproject commit d8eaae80844eed5be48a606f2c604157c9cba7b4 From e28da040ee7b4a579efba53e4a8215fc13ade772 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 20 Nov 2018 13:39:30 +0200 Subject: [PATCH 03/27] Provisioning: Unify duplicated openssl provisioning script MacOS(10.12 and 10.13) had two identical provisioning scripts for openssl. Now unified under common. Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d Reviewed-by: Aapo Keskimolo --- .../common/macos/install_openssl.sh | 81 +++++++++++++++++++ .../qtci-macos-10.12-x86_64/35-openssl.sh | 73 +---------------- .../qtci-macos-10.13-x86_64/35-openssl.sh | 73 +---------------- 3 files changed, 83 insertions(+), 144 deletions(-) create mode 100755 coin/provisioning/common/macos/install_openssl.sh diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh new file mode 100755 index 00000000..15f02ffd --- /dev/null +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install OpenSSL + +set -ex + +# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +opensslVersion="1.0.2p" +opensslFile="openssl-$opensslVersion.tar.gz" +opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" +opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" +opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" + +# Below target location has been hard coded into Coin. +# QTQAINFRA-1195 +openssl_install_dir=/usr/local/openssl-$opensslVersion +opensslTargetLocation="/usr/local/opt/openssl" + +InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" +cd "/tmp/openssl-$opensslVersion" +pwd +sudo ./config --prefix=$openssl_install_dir +echo "Running 'make' for OpenSSL" +sudo make --silent > /tmp/openssl_make.log 2>&1 +echo "Running 'make install' for OpenSSL" +sudo make --silent install > /tmp/openssl_make_install.log 2>&1 + +path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') +sudo mkdir -p "$path" +sudo ln -s $openssl_install_dir $opensslTargetLocation + +SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" +SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" + +SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" +SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" +SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" + +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem + +sudo rm -rf /tmp/openssl-$opensslVersion + +echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index f836cf1d..36bcf53c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,76 +1,5 @@ #!/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 OpenSSL - set -ex -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=/usr/local/openssl-$opensslVersion -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt +source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 9e025a5e..36bcf53c 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -1,76 +1,5 @@ #!/usr/bin/env bash -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install OpenSSL - set -ex -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=/usr/local/openssl-$opensslVersion -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt +source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" From 2657a96f0ed3868490912bd7dc667b72b28aec76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 30 Aug 2018 09:54:13 +0200 Subject: [PATCH 04/27] Upgrade macOS 10.12.3 to 10.12.6 Also changes the resolution of the desktop to 1280x800x32, timezone to GMT and upgrades Xcode. Task-number: QTBUG-70180 Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 8878836c..ec35a2dd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,7 +14,7 @@ qtci-linux-openSUSE-42.3-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch +qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 84a6d06f..304eb0b6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -47,4 +47,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/Xcode_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 462ac422..f7aba0dc 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="8.3.2" -packageName="CommandLineToolsforXcode$version.dmg" +version="9.2" +packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" +sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf" InstallCommandLineTools $url $url $sha1 $packageName $version From 07063160ae5c0ac793285eef45166c91398371ac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Jan 2019 16:48:18 +0100 Subject: [PATCH 05/27] Update submodules on '5.12' in qt5 Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb Reviewed-by: Liang Qi --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 8f931f2d..328418b0 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8f931f2d48ad6e4b1518142036d7631162f57915 +Subproject commit 328418b07dd6f530095008f8a062fa50d2731fe3 diff --git a/qtbase b/qtbase index 9636a43a..dd988e20 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9636a43abcf98dede8b267f557b728e99f0d56cd +Subproject commit dd988e2074fa8d7d230b14ab997bcfc86dc6e1a4 diff --git a/qtdeclarative b/qtdeclarative index c57681bc..c327c43b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c57681bc376d1d912d23b044c48932fa8f7816d7 +Subproject commit c327c43be82c6a2827df1f493ca4e3487a0fc9c3 diff --git a/qtdoc b/qtdoc index ec479952..10b3f2c1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ec479952c079c4e3f6b0c015e82f7060af9706bc +Subproject commit 10b3f2c109eb9737648c4581ad198ae8214be78d diff --git a/qtmultimedia b/qtmultimedia index 982d4c95..5d753119 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 982d4c9505cf427709aac18346dd9df4a13f76c5 +Subproject commit 5d7531192bbb411c24039dd5c68805d42383f547 diff --git a/qtwayland b/qtwayland index 00c0bad3..143a6ad8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 00c0bad3184e32ff0b1dd799b7ef121eaa737c0d +Subproject commit 143a6ad82ea0ded69da482eff1750082fd5b2a6a From 72d0cfc6dc2195d91e2cb89004a09b1e6338a050 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Nov 2018 11:29:51 +0200 Subject: [PATCH 06/27] Provisioning: Add Squish Coco for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2393 Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21 Reviewed-by: Johanna Äijälä --- coin/provisioning/common/linux/squish-coco.sh | 60 +++++++++++++++++++ .../common/windows/squish-coco.ps1 | 48 +++++++++++++++ .../91-squish-coco.sh | 3 + .../qtci-windows-10-x86_64/91-squish-coco.ps1 | 2 + 4 files changed, 113 insertions(+) create mode 100755 coin/provisioning/common/linux/squish-coco.sh create mode 100644 coin/provisioning/common/windows/squish-coco.ps1 create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 diff --git a/coin/provisioning/common/linux/squish-coco.sh b/coin/provisioning/common/linux/squish-coco.sh new file mode 100755 index 00000000..4f8627d3 --- /dev/null +++ b/coin/provisioning/common/linux/squish-coco.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs Squish Coco + +set -ex + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + + +version="4.2.2" +sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6" +package="SquishCocoSetup_${version}_Linux_x86_64.run" +url="http://ci-files01-hki.intra.qt.io/input/coco//$package" + +echo "Enable license for Coco" + +DownloadURL "$url" "$url" "$sha1" "/tmp/$package" +sudo chmod 755 "/tmp/$package" +echo 1 | sudo "/tmp/$package" "--nox11" + +/opt/SquishCoco/bin/cocolic --license-server=Qt-SRV-33.intra.qt.io:49344 + +echo "export PATH=/opt/SquishCoco/bin/:$PATH" >> ~/.bashrc + diff --git a/coin/provisioning/common/windows/squish-coco.ps1 b/coin/provisioning/common/windows/squish-coco.ps1 new file mode 100644 index 00000000..cef4dadf --- /dev/null +++ b/coin/provisioning/common/windows/squish-coco.ps1 @@ -0,0 +1,48 @@ +############################################################################# +# +# Copyright (C) 2018 The Qt Company Ltd. +# Contact: http://www.qt.io/licensing/ +# +# This file is part of the provisioning scripts of the Qt Toolkit. +# +# $QT_BEGIN_LICENSE:LGPL21$ +# Commercial License Usage +# Licensees holding valid commercial Qt licenses may use this file in +# accordance with the commercial license agreement provided with the +# Software or, alternatively, in accordance with the terms contained in +# a written agreement between you and The Qt Company. For licensing terms +# and conditions see http://www.qt.io/terms-conditions. For further +# information use the contact form at http://www.qt.io/contact-us. +# +# GNU Lesser General Public License Usage +# Alternatively, this file may be used under the terms of the GNU Lesser +# General Public License version 2.1 or version 3 as published by the Free +# Software Foundation and appearing in the file LICENSE.LGPLv21 and +# LICENSE.LGPLv3 included in the packaging of this file. Please review the +# following information to ensure the GNU Lesser General Public License +# requirements will be met: https://www.gnu.org/licenses/lgpl.html and +# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +# +# As a special exception, The Qt Company gives you certain additional +# rights. These rights are described in The Qt Company LGPL Exception +# version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +# +# $QT_END_LICENSE$ +# +############################################################################ + +# This script installs Squish Coco for RTA + +. "$PSScriptRoot\helpers.ps1" + + +$coco_version="4.2.2" +$url="http://ci-files01-hki.intra.qt.io/input/coco/SquishCocoSetup_" + $coco_version + "_Windows_x64.exe" +$sha1="d6f9f3c20df086ec9a7e13a068f4446442ae5d51" +$installer="C:\Windows\Temp\SquishCocoSetup_" + $coco_version + "_Windows_x64.exe" + +Download $url $url $installer +Verify-Checksum $installer $sha1 +Run-Executable $installer "/S" +Run-Executable "C:\Program Files\squishcoco\cocolic.exe" "--license-server=Qt-SRV-33.intra.qt.io:49344" +Remove-Item -Force -Path $installer diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh new file mode 100755 index 00000000..43790efd --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 new file mode 100644 index 00000000..bf4f8a96 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 @@ -0,0 +1,2 @@ + "$PSScriptRoot\..\common\windows\squish-coco.ps1" + From 69b079c38eebf252550c8943f9e432eb7c69c1e2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 4 Jan 2019 16:25:52 +0100 Subject: [PATCH 07/27] Update submodules on '5.12' in qt5 Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index dd988e20..8c2ca290 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dd988e2074fa8d7d230b14ab997bcfc86dc6e1a4 +Subproject commit 8c2ca29045498be5fd74b8a4df633e7edae211c6 diff --git a/qtconnectivity b/qtconnectivity index 193e53e5..fb03b1e9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 193e53e544ebbb5ee60d4ad798648df345679e5a +Subproject commit fb03b1e921e641a106722f8f3d59861ce7e6789e diff --git a/qtlocation b/qtlocation index 04ce8e7f..81a9c22e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 04ce8e7f5b7476a08d4f85287e5afb9976ec2d8c +Subproject commit 81a9c22e75f37c8878d41fa2df249ae20bc44adb diff --git a/qtmultimedia b/qtmultimedia index 5d753119..8c26502e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5d7531192bbb411c24039dd5c68805d42383f547 +Subproject commit 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 diff --git a/qtwebengine b/qtwebengine index d8eaae80..005ba799 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d8eaae80844eed5be48a606f2c604157c9cba7b4 +Subproject commit 005ba7997fd4573e65e8c78ad8456ce7a29298a2 From 6e4aed08e13e563b6f82f83b5cb9a4c5f0a48010 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 Jan 2019 22:30:51 +0100 Subject: [PATCH 08/27] Update submodules on '5.12' in qt5 Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8c2ca290..2f4eea5b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c2ca29045498be5fd74b8a4df633e7edae211c6 +Subproject commit 2f4eea5b9cce7b438eeb9016c52a67937d536793 diff --git a/qtwebengine b/qtwebengine index 005ba799..123f97da 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 005ba7997fd4573e65e8c78ad8456ce7a29298a2 +Subproject commit 123f97da6e6bb718682ba046a9ee82a24403cd86 diff --git a/qtwebsockets b/qtwebsockets index a53a28b9..16bfc98a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a53a28b971e3ae1a4a2baf7320ba60f5077f5596 +Subproject commit 16bfc98a03186cef5aafa79709b086faa0d4f9f2 From fe79ca444bd3478a9b5a7b5cac327796a0e486a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 6 Jan 2019 19:19:51 +0100 Subject: [PATCH 09/27] Update submodules on '5.12' in qt5 Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 535f7105..6385ec66 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 535f71053d3ca193666d7583f1961280d50da9f5 +Subproject commit 6385ec6686467112256d68146d608c77fac9cea2 diff --git a/qtbase b/qtbase index 2f4eea5b..ecdccce8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2f4eea5b9cce7b438eeb9016c52a67937d536793 +Subproject commit ecdccce8e468784e050b65052da193bb40e2d9b9 From ca52fc7e29a6d145be03bf6773fcca6e3056034e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 7 Jan 2019 20:55:35 +0100 Subject: [PATCH 10/27] Update submodules on '5.12' in qt5 Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 6385ec66..9d61881e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6385ec6686467112256d68146d608c77fac9cea2 +Subproject commit 9d61881e4bcaebd6f98e647163f1df6b5082a6a8 diff --git a/qtactiveqt b/qtactiveqt index d33a671b..22bcc219 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d33a671b159f5316ddb7e39f375a07d8740c9d15 +Subproject commit 22bcc219a54ddccf000ca6f33057f94ed8bb9551 diff --git a/qtandroidextras b/qtandroidextras index 328418b0..48256a15 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 328418b07dd6f530095008f8a062fa50d2731fe3 +Subproject commit 48256a153eefaeb772d3be97b0c19e3402e0e027 diff --git a/qtbase b/qtbase index ecdccce8..772f56c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ecdccce8e468784e050b65052da193bb40e2d9b9 +Subproject commit 772f56c3cf54dc34dbaa3ae50570a006f9e7721a diff --git a/qtcanvas3d b/qtcanvas3d index f0552b1e..893fbdd0 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f0552b1eb14568fa6802191d13a1123effdbb636 +Subproject commit 893fbdd0f0002b3ff74f6f428329191d120ed439 diff --git a/qtcharts b/qtcharts index eb852ca7..ce310464 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit eb852ca7e5800577762663bc72b1f9d009cf7e51 +Subproject commit ce310464de075a6865952c0845f93a6ea3c1ff6c diff --git a/qtconnectivity b/qtconnectivity index fb03b1e9..99b308ab 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fb03b1e921e641a106722f8f3d59861ce7e6789e +Subproject commit 99b308ab5488e5cfa77f5078eebc2fa9387217b8 diff --git a/qtdatavis3d b/qtdatavis3d index 20f42d4c..9ab15db1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 20f42d4c87162992fc2322e65aee1a1e2b1f28a2 +Subproject commit 9ab15db10215cef84a58a57411f1d27f83aa4b66 diff --git a/qtdeclarative b/qtdeclarative index c327c43b..5ed082ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c327c43be82c6a2827df1f493ca4e3487a0fc9c3 +Subproject commit 5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e diff --git a/qtdoc b/qtdoc index 10b3f2c1..bfe54113 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 10b3f2c109eb9737648c4581ad198ae8214be78d +Subproject commit bfe541139193dafed078c31469e5640ca4c74216 diff --git a/qtgamepad b/qtgamepad index 2d532f3d..35753029 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2d532f3d84654e75273af4a5a34310413555e00f +Subproject commit 357530292e29a25ff6ddec17a3acbf67588813e8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5b242913..cdb0a5dd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5b24291329cdbd19b795b4c3d8aafc4ffd916a2d +Subproject commit cdb0a5dddf84e27dda294cecebd64c282227f162 diff --git a/qtimageformats b/qtimageformats index 178b8572..cbdabc6a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 178b8572d71a34975ffd7ada87227e1b8ed7296e +Subproject commit cbdabc6a23d9ac66c7361a4437f649aacab7d900 diff --git a/qtlocation b/qtlocation index 81a9c22e..1688c44d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 81a9c22e75f37c8878d41fa2df249ae20bc44adb +Subproject commit 1688c44d223145abfdca19a7b31faecbafb0d315 diff --git a/qtmacextras b/qtmacextras index 5d104972..a76ea12d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5d10497214e0dbb3f7d5c2368e5757789ffbbdae +Subproject commit a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 diff --git a/qtmultimedia b/qtmultimedia index 8c26502e..80898b03 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 +Subproject commit 80898b03be54e2855472987f60f4c2526344389b diff --git a/qtnetworkauth b/qtnetworkauth index 71318ed0..c6d51bdf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 71318ed079ddf7c0c3af9d70f64b9519e23b7499 +Subproject commit c6d51bdf097c133955a247c9ebc600c5bc6cff58 diff --git a/qtpurchasing b/qtpurchasing index 2de8d672..ba689d67 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2de8d672b596c6a67afc2a72a293a08d0a3912d8 +Subproject commit ba689d672e74c89bc0aca78f2a8e816c279e9100 diff --git a/qtquickcontrols b/qtquickcontrols index 5e2dfd09..bd952e90 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb +Subproject commit bd952e904070d8eb07748d620829e9dadb8022ba diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b563bd58..520657bd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b563bd583a50442b52e47f8c5f149aebafb385f2 +Subproject commit 520657bdfa0aba68e31758c5952a01c45940cd8f diff --git a/qtremoteobjects b/qtremoteobjects index b513d17f..ab6e0edd 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b513d17fe19c3cf8790d989626521b52f6d1b3d6 +Subproject commit ab6e0edd1a2e25a83c7884b7ce126e7039573eda diff --git a/qtscript b/qtscript index b65a9693..520fb917 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b65a9693f730f625cda95684acfaefd21538a5da +Subproject commit 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 diff --git a/qtscxml b/qtscxml index 1043e8ab..2dfb1d04 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1043e8abd566aa92f63acedbe188a51e83b9555c +Subproject commit 2dfb1d046d4a1dcb046bfb287d240a8869c78baa diff --git a/qtsensors b/qtsensors index 36d12d57..450f9327 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0 +Subproject commit 450f932762eef448081a22e98fa93a191bd9a804 diff --git a/qtserialbus b/qtserialbus index ce265ff8..2b51f76a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ce265ff81223bf7a5978e66dba59fb4b10469b9e +Subproject commit 2b51f76ab712690cc263516d628a4f8cbb723ba8 diff --git a/qtserialport b/qtserialport index a15a7f13..f7580fc3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a15a7f1362454a575a4420cdd89498f42055fe48 +Subproject commit f7580fc30b4ed060b5075be6592c5c0703d40c53 diff --git a/qtspeech b/qtspeech index f224e530..66aa85ed 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f224e5309bc9ee6bf37eb9be2ed345f2cfcb4ce5 +Subproject commit 66aa85ede203372e3c9eba6c399379fa2f3de43f diff --git a/qtsvg b/qtsvg index aa7431fd..a3080340 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aa7431fdabc0434bc30ae8af0753be8c1cb9b576 +Subproject commit a308034012e6cbd35191edb710b721271ce1547a diff --git a/qttools b/qttools index 32897fd0..7249ba65 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 32897fd0b98966d22ecbd475a0e6a77ca8b1108d +Subproject commit 7249ba659951a9ca388a7a09cd301a2d9f79eaa4 diff --git a/qttranslations b/qttranslations index 074b7308..c36807f0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a +Subproject commit c36807f030790ed9bcf9e790d02f765d67d2b8ea diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5aaf55ad..c3fa86ec 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5aaf55adcf3742e05283274ce1b8c721c7da7c8d +Subproject commit c3fa86ece61132155aec047e21772c813a87ddeb diff --git a/qtwayland b/qtwayland index 143a6ad8..024be9dc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 143a6ad82ea0ded69da482eff1750082fd5b2a6a +Subproject commit 024be9dcae26a0d88ffb76f9fca252f2135ad7c9 diff --git a/qtwebchannel b/qtwebchannel index a7bb2699..68ab691b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a7bb269981ad50bd4e8140aa1d9af9e5abd0784d +Subproject commit 68ab691b04d14c8a5582c14842246b1041436094 diff --git a/qtwebengine b/qtwebengine index 123f97da..907303d8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 123f97da6e6bb718682ba046a9ee82a24403cd86 +Subproject commit 907303d85385a9bc7dc4cf8eae771dbe5979ff0d diff --git a/qtwebglplugin b/qtwebglplugin index d0c4de38..c76e2a37 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d0c4de38ddc18792c7a8a90ef2d0091b51736dd3 +Subproject commit c76e2a37310f1e94002488fe33d56d6b00f2d626 diff --git a/qtwebsockets b/qtwebsockets index 16bfc98a..e567b9d8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 16bfc98a03186cef5aafa79709b086faa0d4f9f2 +Subproject commit e567b9d8c8447f8d2bd35ab3184b956e95380222 diff --git a/qtwebview b/qtwebview index a14a1174..0a68deca 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a14a1174cdc7ee2142abd33f85ea820eca90c968 +Subproject commit 0a68deca4de8eca51024cd7ca4235d274cf984fd diff --git a/qtwinextras b/qtwinextras index 669a0856..fac73fd0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 669a0856ffb6908f02ee6212073fa5799c63fea0 +Subproject commit fac73fd06ec6084c41190e80df59a66bc72f7fdb diff --git a/qtx11extras b/qtx11extras index 12bfa3cb..c3f2f14d 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c +Subproject commit c3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 diff --git a/qtxmlpatterns b/qtxmlpatterns index 274f162f..a6efe402 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 274f162fd41c4de88df7efda9e6ec16a1ca968bc +Subproject commit a6efe4020c83384b0aa88aa71da49fce679bc24d From f4b482d844d16f9f0b9b13130a8e42374d85444a Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 8 Jan 2019 12:04:26 +0200 Subject: [PATCH 11/27] Provision: install unixodbc-devel library Adds odbc support for rhel7. Task-number: QTBUG-72444 Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451 Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index b547b479..addfb673 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -109,6 +109,9 @@ installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) installPackages+=(xcb-util-renderutil-devel) +# ODBC support +installPackages+=(unixODBC-devel) +installPackages+=(unixODBC) sudo yum -y install "${installPackages[@]}" From ff127412993e80df0d3a22d7d2660bd2300219a4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Jan 2019 22:40:01 +0100 Subject: [PATCH 12/27] Update submodules on '5.12' in qt5 Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b Reviewed-by: Qt Submodule Update Bot --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 48256a15..478d964c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 48256a153eefaeb772d3be97b0c19e3402e0e027 +Subproject commit 478d964cac7654d36ccfe5882dd09075bb85442d diff --git a/qtbase b/qtbase index 772f56c3..5733dfbd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 772f56c3cf54dc34dbaa3ae50570a006f9e7721a +Subproject commit 5733dfbd90fd059e7310786faefb022b00289592 diff --git a/qtconnectivity b/qtconnectivity index 99b308ab..45608abd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 99b308ab5488e5cfa77f5078eebc2fa9387217b8 +Subproject commit 45608abda7b9470ec0b3ea26e849ec71b637288d diff --git a/qtdeclarative b/qtdeclarative index 5ed082ea..52727146 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e +Subproject commit 52727146db11d3f7f454e15865655d03496a3300 diff --git a/qtdoc b/qtdoc index bfe54113..c556903f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bfe541139193dafed078c31469e5640ca4c74216 +Subproject commit c556903f7571e9f533dc016a97f2189767058c70 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 520657bd..6476de0b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 520657bdfa0aba68e31758c5952a01c45940cd8f +Subproject commit 6476de0b669162cf08c11f5c8d5ad0b42419f365 diff --git a/qtwebengine b/qtwebengine index 907303d8..a2ef759b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 907303d85385a9bc7dc4cf8eae771dbe5979ff0d +Subproject commit a2ef759b28fc4ac4a3b51d10d15ce13519f56a66 diff --git a/qtwebview b/qtwebview index 0a68deca..bb7b87f5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0a68deca4de8eca51024cd7ca4235d274cf984fd +Subproject commit bb7b87f584128bfa5325921a60e80e3d03f9e194 From 7028ee31848b3f5d7e722a2bc91f5dbcb88f4562 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Mon, 7 Jan 2019 13:00:04 +0200 Subject: [PATCH 13/27] Fix broken provisioning script DownloadURL.sh DownloadURL returns 0 even when alt download fails. Task-number: QTQAINFRA-2501 Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233 Reviewed-by: Paul Wicking --- coin/provisioning/common/unix/DownloadURL.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 2d82af58..996c99da 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -40,6 +40,8 @@ # If called directly from another script, it will exit the parent script # as well, if not called in its own subshell with parentheses. +set -ex + function DownloadURL { url=$1 url_alt=$2 @@ -47,11 +49,11 @@ function DownloadURL { targetFile=$4 echo "Downloading from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || ( + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || { echo "Failed to download '$url' multiple times" echo "Downloading from alternative URL '$url_alt'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" - ) + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; } + } echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > "$targetFile.sha1" From 0b18f12f99e4e4c005c7287cd5b486274671abf0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Jan 2019 09:45:29 +0100 Subject: [PATCH 14/27] Prospective fix for git lfs installation Keys used to sign package repositories tend to have expiry dates and therefore need to be changed from time to time. Therefore hardcoding the key we expect here will break (as it does right now) and it's better to retrieve the expected key via a secure transport. The old key - per http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex - will expire on the 12 of January. That's probably why they changed the key used to sign the repo before the expiry. Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4 Reviewed-by: Maurice Kalinowski Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh index b7adce5b..7f5140fd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh @@ -37,7 +37,7 @@ set -ex +curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add - sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F sudo apt update sudo apt install git-lfs From 56c43a03cd3c974a981baf98f8aa7320c413e2e6 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 7 Jan 2019 11:20:44 +0100 Subject: [PATCH 15/27] Provisioning: Update Qt OpcUA backends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Unified Automation SDK needs to be updated to 1.6x to reflect latest API changes - Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no need to provision it. Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae Reviewed-by: Jannis Völker Reviewed-by: Frank Meerkoetter Reviewed-by: Rainer Keller --- coin/provisioning/common/linux/open62541.sh | 73 ----- .../windows/opcua_unifiedautomation.ps1 | 8 +- .../provisioning/common/windows/open62541.ps1 | 265 ------------------ .../50-open62541.sh | 37 --- .../50-open62541.sh | 36 --- .../50-open62541.sh | 37 --- .../qtci-windows-10-x86_64/79-open62541.ps1 | 1 - .../qtci-windows-7-x86/79-open62541.ps1 | 2 - 8 files changed, 4 insertions(+), 455 deletions(-) delete mode 100755 coin/provisioning/common/linux/open62541.sh delete mode 100644 coin/provisioning/common/windows/open62541.ps1 delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/79-open62541.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh deleted file mode 100755 index 962e8963..00000000 --- a/coin/provisioning/common/linux/open62541.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set +e - -# shellcheck disable=SC1090 - -# We need to source to be able to use cmake in the shell -if uname -a |grep -q "Ubuntu"; then - source ~/.profile -else - source ~/.bashrc -fi - -set -ex - -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" -# shellcheck disable=SC2064 -trap "sudo rm -fr $TEMPDIR" EXIT -cd "$TEMPDIR" - -sudo pip install --upgrade pip -sudo pip install six - -git clone https://github.com/open62541/open62541.git open62541 -cd open62541 -git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f -mkdir build -cd build -TARGETPATH=/opt/open62541 -cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" .. -make - -sudo make install -sudo /sbin/ldconfig - -SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH" - diff --git a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 index aff784b9..cdc54c2b 100644 --- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 +++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## 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. @@ -34,11 +34,11 @@ . "$PSScriptRoot\helpers.ps1" $zip = Get-DownloadLocation "uasdkcpp.zip" -$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022" +$sha1 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C" $installLocation = "C:\Utils\uacpp" Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..." -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406.zip" # No public download link exists $externalUrl = $internalUrl @@ -49,7 +49,7 @@ Write-Host "UACPPSDK: Installing $zip..." Extract-7Zip $zip (Get-DefaultDownloadLocation) Remove-Item -Path $zip -$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe" +$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406.exe" $arguments = "/S /D=$installLocation" Run-Executable $executable $arguments Write-Host "UACPPSDK: Installer done." diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 deleted file mode 100644 index b7eceb4d..00000000 --- a/coin/provisioning/common/windows/open62541.ps1 +++ /dev/null @@ -1,265 +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$ -## -############################################################################# - -Param ( - [string]$targetCommand= "" - ) - -. "$PSScriptRoot\helpers.ps1" - -## Variables for builds -$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f" -$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d" -$extractTarget = "C:\open62541_build" - -function CreateArchive -{ - param( - [string]$sourceDirectory=$(throw("You must specify a directory")), - [string]$archiveName=$(throw("You must specify an archive name")) - ) - - if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) { - $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe' - if (-not (test-path $zipExe)) { - $zipExe = "C:\Utils\sevenzip\7z.exe" - if (-not (test-path $zipExe)) { - throw "Could not find 7-zip." - } - } - } else { - $zipExe = "7z.exe" - } - - Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`"" -} - -function PrepareRepository -{ - $username = $env:USERNAME - $zip = "c:\users\$username\downloads\open62541.zip" - - $externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip" - $internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip" - - Download $externalUrl $internalUrl $zip - Verify-Checksum $zip $sha1 - - Extract-7Zip $zip $extractTarget -} - -function PushDevEnvironment -{ - # Provisioning updates the registry entries for PATH etc. However, they are not - # propagated to the next provisioning script and hence need to be manually - # read / set. - $adaptedPath = $env:PATH - $jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine") - $adaptedPath = $adaptedPath + ";" + $jomLocation - $adaptedPath = $adaptedPath + ";" + "C:\Python27" - $adaptedPath = $adaptedPath + ";" + "C:\CMake\bin" - [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process") -} - -function MSVCEnvironment -{ - Param ( - [string]$msvcDir=$(throw("No VS Directory specified")), - [string]$msvcbat=$(throw("No vsvars batch file specified")) - ) - - Push-Location $msvcDir - cmd /c "$msvcbat&set" | - foreach { - if ($_ -match "=") { - $v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])" - } - } - Pop-Location -} - -function BuildAndInstallOpen62541 -{ - Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), - [string]$Platform=$(throw("You must specify the target platform [x86, x64]")), - [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]")) - ) - Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand" - - ## Make Build directory - $buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform - if (Test-Path $buildDir) { - Write-Host " Deleting pre-existing build directory" - Remove-Item $buildDir -Force -Recurse - } - New-Item -ItemType Directory -Force -Path $buildDir - Push-Location $buildDir - - ## Invoke Cmake - $makeGenerator = "NMake Makefiles JOM" - $installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform - if (Test-Path $installTarget) { - Write-Host " Deleting pre-existing install directory" - Remove-Item $installTarget -Force -Recurse - } - - if ($Type.StartsWith("mingw")) { - $makeGenerator = "MinGW Makefiles" - } - cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib .. - - ## Call build command - Write-Host "### Open62541: Compilation ###" - Run-Executable $MakeCommand - - ## call install command - Write-Host "### Open62541: Installation ###" - Run-Executable $MakeCommand install - - $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX" - Set-EnvironmentVariable $platformVariable $installTarget - - ## Packaging - Push-Location "C:\Utils" - $archiveName = "open62541_" + $Type + "_" + $Platform + ".7z" - CreateArchive $installTarget $archiveName - Pop-Location - - ## cleanup build directory - Write-Host "### Open62541: Cleanup ###" - Pop-Location - Remove-Item $buildDir -Force -Recurse -} - -function DownloadAndInstall -{ - Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), - [string]$Platform=$(throw("You must specify the target platform [x86, x64]")) - ) - $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/" - $targetName = "open62541_" + $Type + "_" + $Platform - $archiveName = $targetName + ".7z" - $downloadUrl = $baseLocation + $archiveName - - # Download - $downloadTarget = "C:\Utils\" + $archiveName - Download $downloadUrl $downloadUrl $downloadTarget - - # Extract - Push-Location C:\Utils - Extract-7Zip $downloadTarget C:\Utils - Pop-Location - - # Set environment variable - $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform - $platformPath = "C:\Utils\" + $targetName - Set-EnvironmentVariable $platformVariable $platformPath -} - -############################## -# Startup # -############################## -if ($targetCommand.StartsWith("mingw")) { - Write-Host "### Creating Open62541 for MinGW" - $mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine") - if (!$mingwPath) { - throw("Could not find mingw") - } - - # Strawberry has its own gcc, put mingw in front - $adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine") - [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process") - - PushDevEnvironment - BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make" -} elseif ($targetCommand -eq "msvc2015_x86") { - Write-Host "### Creating Open62541 for MSVC2015 x86" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86" - PushDevEnvironment - BuildAndInstallOpen62541 msvc2015 x86 jom -} elseif ($targetCommand -eq "msvc2015_x64") { - Write-Host "### Creating Open62541 for MSVC2015 x64" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64" - PushDevEnvironment - BuildAndInstallOpen62541 msvc2015 x64 jom -} elseif ($targetCommand -eq "msvc2017_x86") { - Write-Host "### Creating Open62541 for MSVC2017 x86" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat - PushDevEnvironment - BuildAndInstallOpen62541 msvc2017 x86 jom -} elseif ($targetCommand -eq "msvc2017_x64") { - Write-Host "### Creating Open62541 for MSVC2017 x64" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat - PushDevEnvironment - BuildAndInstallOpen62541 msvc2017 x64 jom -} elseif ($targetCommand -eq "prepare") { - PrepareRepository -} elseif ($targetCommand -eq "build") { - Write-Host "### Building for all supported platforms" - PrepareRepository - Write-Host "### Invoking MinGW530 build" - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530 - Write-Host "### Invoking MinGW630 build" - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630 - Write-Host "### Invoking MinGW730 build" - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730 - Write-Host "### Invoking MSVC2015 build" - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86 - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64 - Write-Host "### Invoking MSVC2017 build" - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86 - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64 - Write-Host "### Archives have been generated at C:/Utils. Please upload manually" -} elseif ($targetCommand -eq "packaged") { - Write-Host "### Expecting pre-built packages, download and install from archives" - Write-Host "### MinGW530 x64" - DownloadAndInstall mingw530 x86 - Write-Host "### MinGW630 x64" - DownloadAndInstall mingw630 x86 - Write-Host "### MinGW730 x64" - DownloadAndInstall mingw730 x64 - Write-Host "### MSVC2015 x86" - DownloadAndInstall msvc2015 x86 - Write-Host "### MSVC2015 x64" - DownloadAndInstall msvc2015 x64 - Write-Host "### MSVC2017 x64" - DownloadAndInstall msvc2017 x64 -} elseif ($targetCommand) { - Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)" - throw("Unknown parameter") -} else { - # Default behavior - PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build -} diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh deleted file mode 100755 index 21c926b8..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# shellcheck source=../common/linux/open62541.sh -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh deleted file mode 100755 index a4b63493..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh deleted file mode 100755 index 21c926b8..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# shellcheck source=../common/linux/open62541.sh -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/79-open62541.ps1 b/coin/provisioning/qtci-windows-10-x86_64/79-open62541.ps1 deleted file mode 100644 index 9b532392..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/79-open62541.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\open62541.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 b/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 deleted file mode 100644 index 85bfb98c..00000000 --- a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare -. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730 From cfa7877afe3bd77c9f77bff1edad4ae24e983bf9 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 10 Jan 2019 09:01:15 +0200 Subject: [PATCH 16/27] Fix provisioning ODBC environmetal variables had : at end CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had --> : <-- at end of variable. As this adds current dir to search path this is undesirable and causes bugs. Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922 Reviewed-by: Juha Karjalainen Reviewed-by: Michal Klocek --- coin/provisioning/common/macos/libiodbc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 6c10ccbf..79fa86c2 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -48,7 +48,7 @@ brew install libiodbc read -r -a arr <<< $(brew list --versions libiodbc) version=${arr[1]} -SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH" -SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH" +SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}" +SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}" echo "libiodbc = $version" >> ~/versions.txt From 3b5c10004051975d0743b92f82879cc52d3c7396 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 10 Jan 2019 10:44:24 +0100 Subject: [PATCH 17/27] Update submodules on '5.12' in qt5 Skip qtbase in this round. Change-Id: Ib718f8343c710c22bb241867bf3b90eb11aabe05 Reviewed-by: Liang Qi --- qt3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 9d61881e..82eb8b44 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9d61881e4bcaebd6f98e647163f1df6b5082a6a8 +Subproject commit 82eb8b44e0a3d1dc586acc52132be2b05102900c diff --git a/qtconnectivity b/qtconnectivity index 45608abd..e957470a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 45608abda7b9470ec0b3ea26e849ec71b637288d +Subproject commit e957470ae0e61eea1afa96d76468dbdc87168421 diff --git a/qtdeclarative b/qtdeclarative index 52727146..7bcc5242 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 52727146db11d3f7f454e15865655d03496a3300 +Subproject commit 7bcc5242c1543785ae4d6a54b9096874a421582f diff --git a/qtdoc b/qtdoc index c556903f..20e2c195 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c556903f7571e9f533dc016a97f2189767058c70 +Subproject commit 20e2c195f44286e91ed46d96a3b54c552e6e2943 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index cdb0a5dd..43564140 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit cdb0a5dddf84e27dda294cecebd64c282227f162 +Subproject commit 43564140cb702994971f7c5fff3227f700c32995 diff --git a/qttools b/qttools index 7249ba65..ee9f6ec9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7249ba659951a9ca388a7a09cd301a2d9f79eaa4 +Subproject commit ee9f6ec9b9e8f0d18ad7e8fededb5292abb91912 diff --git a/qtwayland b/qtwayland index 024be9dc..1e29215b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 024be9dcae26a0d88ffb76f9fca252f2135ad7c9 +Subproject commit 1e29215b2e40a38b9324a719888749e12a74e99c diff --git a/qtwebengine b/qtwebengine index a2ef759b..5ac98b60 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2ef759b28fc4ac4a3b51d10d15ce13519f56a66 +Subproject commit 5ac98b606c1c297b34887f5d6bd51c8dda515f65 From 6930998900ac0f4a528c6275cb5edc11dd137d36 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 21 Nov 2018 13:30:56 +0200 Subject: [PATCH 18/27] Add qtsaferenderer extra targets for Coin The cross-compile targets that qtsaferenderer needs do not exist in qt5 therefore we add those extra targets for CI. Task-number: QSR-378 Change-Id: Ia07074392b09af8d111a957027407f85518e5d85 Reviewed-by: Aapo Keskimolo (cherry picked from commit f7b6a4c27635e87cb296cd20c7596f437b37d504) Reviewed-by: Kari Oikarinen --- coin/platform_configs/tqtc-qtsaferenderer.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 coin/platform_configs/tqtc-qtsaferenderer.txt diff --git a/coin/platform_configs/tqtc-qtsaferenderer.txt b/coin/platform_configs/tqtc-qtsaferenderer.txt new file mode 100644 index 00000000..0391b5d7 --- /dev/null +++ b/coin/platform_configs/tqtc-qtsaferenderer.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker From c1f3a886edf4762372a57849147c2fe1b1527144 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 9 Jan 2019 12:52:43 +0200 Subject: [PATCH 19/27] Provisioning: Signtools for Windows x86 QtDesignStudio requires signtools for Windows x86 Task-number: QTBUG-72907 Change-Id: I7fb15cb07511cb89d3be00e1fe65247ecc21bcfe Reviewed-by: Tim Jenssen --- .../qtci-windows-10-x86/90-signing-tools.ps1 | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 new file mode 100644 index 00000000..2ad25685 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\windows\helpers.ps1" + +# Signing tools are needed to sign offline installers when releasing + +$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" +$destination = "C:\Windows\temp\sign.zip" + +Download $url $url $destination +Extract-7Zip "$destination" "C:\Utils" +Remove-Item -Path "$destination" From 209d09d53000996a5f2980c4d822ad1d8c36ea2e Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 14 Jan 2019 14:07:16 +0100 Subject: [PATCH 20/27] Provisioning: Update Unified Automation OpcUA backend Adding in the x64 bit installers to deployment. Furthermore, we can use the msvc2015 installer to create msvc2017 binaries with Qt. After the licensing change, we will be able to generate packages for all msvc based installers. Change-Id: I96db345b535a2518c758175137c808b15130ff41 Reviewed-by: Rainer Keller --- .../windows/opcua_unifiedautomation.ps1 | 69 ++++++++++++++----- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 index cdc54c2b..70fcaae0 100644 --- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 +++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 @@ -33,27 +33,58 @@ . "$PSScriptRoot\helpers.ps1" -$zip = Get-DownloadLocation "uasdkcpp.zip" -$sha1 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C" -$installLocation = "C:\Utils\uacpp" +function DownloadAndInstallUA +{ + Param ( + [string] $InstallerFileName = $(BadParam("no download URL specified")), + [string] $sha1 = $(BadParam("No SHA1 for download specified")), + [string] $Destination = $(BadParam("No location to install specified")) + ) + Write-Host "UACPPSDK: DownloadAndInstallUA $InstallerFileName" + $zip = Get-DownloadLocation "uasdkcpp.zip" -Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..." -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406.zip" -# No public download link exists -$externalUrl = $internalUrl + Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..." + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/$InstallerFileName.zip" + # No public download link exists + $externalUrl = $internalUrl -Download $externalUrl $internalUrl $zip -Verify-Checksum $zip $sha1 + Download $externalUrl $internalUrl $zip + Verify-Checksum $zip $sha1 -Write-Host "UACPPSDK: Installing $zip..." -Extract-7Zip $zip (Get-DefaultDownloadLocation) -Remove-Item -Path $zip + Write-Host "UACPPSDK: Extracting $zip..." + Extract-7Zip $zip (Get-DefaultDownloadLocation) + Remove-Item -Path $zip -$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406.exe" -$arguments = "/S /D=$installLocation" -Run-Executable $executable $arguments -Write-Host "UACPPSDK: Installer done." -Remove-Item $executable + $executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe" + # We cannot call the installer as the x86 and x64 versions of the installer are not + # allowed to be installed in parallel (they check for the same registry value and + # delete each other). Extracting does not have a side-effect for Qt + #$arguments = "/S /D=$installLocation" + #Run-Executable $executable $arguments + #Write-Host "UACPPSDK: Installer done." + #Remove-Item $executable -Write-Host "Set environment variable for COIN to locate SDK" -Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation" + Extract-7Zip $executable $Destination + Remove-Item $executable +} + +#x86 version +$installerName86 = "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406" +$downloadSha86 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C" +$installLocation86 = "C:\Utils\uacpp_x86" + +DownloadAndInstallUA $installerName86 $downloadSha86 $installLocation86 +Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation86" +# For UA msvc2015 is binary compatible with msvc2017 +Set-EnvironmentVariable "CI_UACPP_msvc2017_x86_PREFIX" "$installLocation86" + + +#x64 version +$installerName64 = "uasdkcppbundle-bin-EVAL-win64-x86_64-vs2015-v1.6.3-406" +$downloadSha64 = "1384e6882644f9163e9840aee962cdb9ca3398c8" +$installLocation64 = "C:\Utils\uacpp_x64" + +DownloadAndInstallUA $installerName64 $downloadSha64 $installLocation64 +Set-EnvironmentVariable "CI_UACPP_msvc2015_x64_PREFIX" "$installLocation64" +# For UA msvc2015 is binary compatible with msvc2017 +Set-EnvironmentVariable "CI_UACPP_msvc2017_x64_PREFIX" "$installLocation64" From ea0825abe8aadf927376f25620c2e6053470a4ee Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 15 Jan 2019 09:45:00 +0200 Subject: [PATCH 21/27] Provisioning: Remove update notifier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update notifier is showing when vm is running. It can affect to test results and that's why it need to be removed Task-number: QTQAINFRA-2453 Change-Id: Icb27ba998ef9a51aaf8f40274c182b0c3dcd496a Reviewed-by: Sami Nurmenniemi Reviewed-by: Juha Karjalainen Reviewed-by: Simo Fält --- coin/provisioning/common/linux/remove-update_notifier.sh | 3 +++ .../02-remove-update_notifier.sh | 4 ++++ 2 files changed, 7 insertions(+) create mode 100755 coin/provisioning/common/linux/remove-update_notifier.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh diff --git a/coin/provisioning/common/linux/remove-update_notifier.sh b/coin/provisioning/common/linux/remove-update_notifier.sh new file mode 100755 index 00000000..152d7fa8 --- /dev/null +++ b/coin/provisioning/common/linux/remove-update_notifier.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +sudo apt -q -y remove update-notifier update-manager diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh new file mode 100755 index 00000000..55c6ce79 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-update_notifier.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" From 6d2929d1aaa97454619725211eee4ff65c54b95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 18 Aug 2017 12:32:37 +0300 Subject: [PATCH 22/27] Provisioning: Move Android toolchain and config to win10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing Android toolchains and ssl headers to win10 template and moving Android windows platform configs to win10 from win7. Task-number: QTQAINFRA-1266 Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c Reviewed-by: Tony Sarajärvi (cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034) --- coin/platform_configs/qt5.txt | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- .../04-msys.ps1 => common/windows/msys.ps1} | 2 +- coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 | 1 + .../10-openssl_for_android.ps1} | 0 .../40-android.ps1} | 0 6 files changed, 6 insertions(+), 5 deletions(-) rename coin/provisioning/{qtci-windows-7-x86/04-msys.ps1 => common/windows/msys.ps1} (90%) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 rename coin/provisioning/{qtci-windows-7-x86/31-android_openssl.ps1 => qtci-windows-10-x86_64/10-openssl_for_android.ps1} (100%) rename coin/provisioning/{qtci-windows-7-x86/30-android.ps1 => qtci-windows-10-x86_64/40-android.ps1} (100%) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5a189f25..3de18a74 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..4fe5e5ee 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/common/windows/msys.ps1 similarity index 90% rename from coin/provisioning/qtci-windows-7-x86/04-msys.ps1 rename to coin/provisioning/common/windows/msys.ps1 index 24d7a5ca..df67cc20 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install msys which is needed for configuring openssl for Android diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 new file mode 100644 index 00000000..44efea92 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\msys.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/30-android.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 From 34c751db5eef459ea508265330620824faf9636e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 16 Jan 2019 14:38:01 +0100 Subject: [PATCH 23/27] Update submodules on '5.12' in qt5 Change-Id: I99897f12572b1927ef140ac0dd3430db2f97799c Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 82eb8b44..093484cd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 82eb8b44e0a3d1dc586acc52132be2b05102900c +Subproject commit 093484cd41e0b727e4f2a33bd753a778e62af819 diff --git a/qtactiveqt b/qtactiveqt index 22bcc219..abc831d8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 22bcc219a54ddccf000ca6f33057f94ed8bb9551 +Subproject commit abc831d8dfed32167d8ea67071b3f36284bec299 diff --git a/qtandroidextras b/qtandroidextras index 478d964c..82fbed74 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 478d964cac7654d36ccfe5882dd09075bb85442d +Subproject commit 82fbed7445875678ab4b3d29fed89bbfcbf890fa diff --git a/qtbase b/qtbase index 5733dfbd..c365fa49 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5733dfbd90fd059e7310786faefb022b00289592 +Subproject commit c365fa49d85810c6ad09bb5f43b5081cd7543bf1 diff --git a/qtcanvas3d b/qtcanvas3d index 893fbdd0..31446427 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 893fbdd0f0002b3ff74f6f428329191d120ed439 +Subproject commit 314464271ca5d10db37b7bb2f1b52e6c003e4197 diff --git a/qtcharts b/qtcharts index ce310464..acbd92f9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ce310464de075a6865952c0845f93a6ea3c1ff6c +Subproject commit acbd92f90c139839277a60db84753a102dffbcf2 diff --git a/qtconnectivity b/qtconnectivity index e957470a..1bba2694 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e957470ae0e61eea1afa96d76468dbdc87168421 +Subproject commit 1bba2694302b7200d62d715827f20e8f830d9e03 diff --git a/qtdatavis3d b/qtdatavis3d index 9ab15db1..a0e8ef6c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9ab15db10215cef84a58a57411f1d27f83aa4b66 +Subproject commit a0e8ef6caf838267811308b668fa76357a1932aa diff --git a/qtdeclarative b/qtdeclarative index 7bcc5242..f0a9c1ef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7bcc5242c1543785ae4d6a54b9096874a421582f +Subproject commit f0a9c1efe36b952dfe3e802f3ceeee6ed10a65f5 diff --git a/qtdoc b/qtdoc index 20e2c195..478c0843 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 20e2c195f44286e91ed46d96a3b54c552e6e2943 +Subproject commit 478c0843c48259ce257dea0cf4e383dbb7944c9a diff --git a/qtgamepad b/qtgamepad index 35753029..2826fb63 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 357530292e29a25ff6ddec17a3acbf67588813e8 +Subproject commit 2826fb63aa9936388950e90d8255b4b4579e6328 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 43564140..64c479e1 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 43564140cb702994971f7c5fff3227f700c32995 +Subproject commit 64c479e151557343a1ffc684e2ba76c9ef97b1f9 diff --git a/qtimageformats b/qtimageformats index cbdabc6a..50f66981 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cbdabc6a23d9ac66c7361a4437f649aacab7d900 +Subproject commit 50f6698117c2259bdd78868620908eec79e09561 diff --git a/qtlocation b/qtlocation index 1688c44d..b17c07dc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1688c44d223145abfdca19a7b31faecbafb0d315 +Subproject commit b17c07dc0b947c979372fbaf558ce9acc07d1837 diff --git a/qtmacextras b/qtmacextras index a76ea12d..c8d6f787 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 +Subproject commit c8d6f78710198afb83dfac1af3c8026eabed1cca diff --git a/qtmultimedia b/qtmultimedia index 80898b03..0caa716a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 80898b03be54e2855472987f60f4c2526344389b +Subproject commit 0caa716a92f8f971813fced4bd9f7d62a53cbcdb diff --git a/qtnetworkauth b/qtnetworkauth index c6d51bdf..c4ac0d51 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c6d51bdf097c133955a247c9ebc600c5bc6cff58 +Subproject commit c4ac0d51133be25aace898b357a6744094d20125 diff --git a/qtpurchasing b/qtpurchasing index ba689d67..4e7e9fc7 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ba689d672e74c89bc0aca78f2a8e816c279e9100 +Subproject commit 4e7e9fc7bcc97e9278b25ecb35e6798c2ca229d6 diff --git a/qtqa b/qtqa index 25a8c32e..1de7f463 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25a8c32e77692f6ffc5d73136cd6d74cf293e081 +Subproject commit 1de7f4634d468458dce049627685a0342e8f3233 diff --git a/qtquickcontrols b/qtquickcontrols index bd952e90..b1b68aa2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bd952e904070d8eb07748d620829e9dadb8022ba +Subproject commit b1b68aa279275e93b867c29fa42350f42b9d9728 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6476de0b..fa4b1aa6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6476de0b669162cf08c11f5c8d5ad0b42419f365 +Subproject commit fa4b1aa6024f5f3b2d0e0502561b1eaedddd0c78 diff --git a/qtremoteobjects b/qtremoteobjects index ab6e0edd..0295c861 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ab6e0edd1a2e25a83c7884b7ce126e7039573eda +Subproject commit 0295c86166ae8335d448d26f2ae50d542f6e133b diff --git a/qtscript b/qtscript index 520fb917..66f1a94a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 +Subproject commit 66f1a94aead9c9b3dacbf91ef763edcda217e56e diff --git a/qtscxml b/qtscxml index 2dfb1d04..f167b3cd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2dfb1d046d4a1dcb046bfb287d240a8869c78baa +Subproject commit f167b3cdb61a0bd51360d9736f23e99e5ae0c860 diff --git a/qtsensors b/qtsensors index 450f9327..b6a72a46 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 450f932762eef448081a22e98fa93a191bd9a804 +Subproject commit b6a72a463203cf8cdd03cd9ea135ea396ec2ed42 diff --git a/qtserialbus b/qtserialbus index 2b51f76a..59f4eed6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 2b51f76ab712690cc263516d628a4f8cbb723ba8 +Subproject commit 59f4eed65ab9730162ddf5b1d5c1ac260024a361 diff --git a/qtserialport b/qtserialport index f7580fc3..1f1fa990 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f7580fc30b4ed060b5075be6592c5c0703d40c53 +Subproject commit 1f1fa990f8d16625d2c6a65aea58a010495cbc77 diff --git a/qtspeech b/qtspeech index 66aa85ed..42000618 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 66aa85ede203372e3c9eba6c399379fa2f3de43f +Subproject commit 420006184c2e38bf21d466f167b64fe149b63a1a diff --git a/qtsvg b/qtsvg index a3080340..ac797c4e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a308034012e6cbd35191edb710b721271ce1547a +Subproject commit ac797c4e17376b5497e0c37f15b9da48d622d18f diff --git a/qttools b/qttools index ee9f6ec9..2ed52386 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ee9f6ec9b9e8f0d18ad7e8fededb5292abb91912 +Subproject commit 2ed52386508ae6c674dd58d928cc0cffff98287e diff --git a/qttranslations b/qttranslations index c36807f0..6431236b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c36807f030790ed9bcf9e790d02f765d67d2b8ea +Subproject commit 6431236ba6506c0eb9263e2b14d8b84d7716b12c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c3fa86ec..d08539ba 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c3fa86ece61132155aec047e21772c813a87ddeb +Subproject commit d08539bae35521bbd7ee60958b4492705efe5b3f diff --git a/qtwayland b/qtwayland index 1e29215b..701a7773 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1e29215b2e40a38b9324a719888749e12a74e99c +Subproject commit 701a7773e383816ccdfe37a48b766f4bb6c16851 diff --git a/qtwebchannel b/qtwebchannel index 68ab691b..45bc3ab0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 68ab691b04d14c8a5582c14842246b1041436094 +Subproject commit 45bc3ab0bbc292be26b2bf0596487d9c7f2059d3 diff --git a/qtwebengine b/qtwebengine index 5ac98b60..d9548e2f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5ac98b606c1c297b34887f5d6bd51c8dda515f65 +Subproject commit d9548e2f13bc83fef0db4d2619e5ac7279787f0c diff --git a/qtwebglplugin b/qtwebglplugin index c76e2a37..737aa941 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit c76e2a37310f1e94002488fe33d56d6b00f2d626 +Subproject commit 737aa941f9eeef5979df2b223ad9ae58768bfe2d diff --git a/qtwebsockets b/qtwebsockets index e567b9d8..58dc0949 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e567b9d8c8447f8d2bd35ab3184b956e95380222 +Subproject commit 58dc09497d2fb580cf5e356bef91b0dc61ae81b7 diff --git a/qtwebview b/qtwebview index bb7b87f5..5f219dd5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bb7b87f584128bfa5325921a60e80e3d03f9e194 +Subproject commit 5f219dd53bb87da9e07a65177c9bdfb289f7d14e diff --git a/qtwinextras b/qtwinextras index fac73fd0..92720ed8 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fac73fd06ec6084c41190e80df59a66bc72f7fdb +Subproject commit 92720ed84d88d5cf96b958ae4e6ad134421804d0 diff --git a/qtx11extras b/qtx11extras index c3f2f14d..d5a574ec 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit c3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 +Subproject commit d5a574ec945cce6f53232c53030d9b3b691f9032 diff --git a/qtxmlpatterns b/qtxmlpatterns index a6efe402..79984891 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a6efe4020c83384b0aa88aa71da49fce679bc24d +Subproject commit 79984891427743dfb16df056ecee56384024e93e From 33322231304252d5dc140d8e5b4cbe802b5e74ec Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 14 Nov 2018 10:04:40 +0200 Subject: [PATCH 24/27] Provisioning: breakpad for qt3dstudio Breakpad https://chromium.googlesource.com/breakpad/breakpad/ sources are needed for qt3studio. Also Breakpad need sources for https://chromium.googlesource.com/linux-syscall-support. Task-number: QT3DS-2650 Change-Id: I13c7534e1c6e97a1e345dad3c2c82eeb6428313d Reviewed-by: Heikki Halmet --- .../common/unix/install-breakpad.sh | 81 ++++++++++++++++ coin/provisioning/common/windows/helpers.ps1 | 22 +++++ .../common/windows/install-breakpad.ps1 | 94 +++++++++++++++++++ .../35-install-breakpad.sh | 6 ++ .../35-install-breakpad.sh | 6 ++ .../35-install-breakpad.sh | 6 ++ .../35-install-breakpad.sh | 6 ++ .../35-install-breakpad.ps1 | 1 + .../35-install-breakpad.ps1 | 1 + .../35-install-breakpad.ps1 | 1 + 10 files changed, 224 insertions(+) create mode 100755 coin/provisioning/common/unix/install-breakpad.sh create mode 100644 coin/provisioning/common/windows/install-breakpad.ps1 create mode 100644 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/35-install-breakpad.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/35-install-breakpad.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/35-install-breakpad.ps1 diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh new file mode 100755 index 00000000..669469be --- /dev/null +++ b/coin/provisioning/common/unix/install-breakpad.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +set -ex + +breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae" +breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz" +breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar" +breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c" + +linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf" +linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz" +linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar" +linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4" + +targetBreakpad="/tmp/$breakpad_tar" +targetSyscall="/tmp/$linux_syscall_support_tar" +installFolder="$HOME" +breakpadHome="$HOME/breakpad" + +# shellcheck disable=SC2015 +( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && ( + DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall" + ) && ( + tar -xzf "$targetBreakpad" -C "$installFolder" + tar -xzf "$targetSyscall" -C "/tmp" + mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/" + rm -rf $targetBreakpad + rm -rf $targetSyscall + ) || ( + cd "$HOME" + git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome" + git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss" + cd "$breakpadHome" + git checkout "$breakpad_commit_sha" + cd "$breakpadHome/src/third_party/lss" + git checkout "$linux_syscall_support_commit_sha1" + ) + + +SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src" + +echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt +echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index cbf2371f..76ad4867 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -35,6 +35,28 @@ function Run-Executable } } +function Extract-tar_gz +{ + Param ( + [string]$Source, + [string]$Destination + ) + Write-Host "Extracting '$Source' to '$Destination'..." + + if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) { + $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe' + if (-not (test-path $zipExe)) { + $zipExe = "C:\Utils\sevenzip\7z.exe" + if (-not (test-path $zipExe)) { + throw "Could not find 7-zip." + } + } + } else { + $zipExe = "7z.exe" + } + Run-Executable "cmd.exe" "/C $zipExe x -y `"$Source`" -so | $zipExe x -y -aoa -si -ttar `"-o$Destination`"" +} + function Extract-7Zip { Param ( diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 new file mode 100644 index 00000000..4a9544cc --- /dev/null +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -0,0 +1,94 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ + +# This script install breakpad from sources. +# for manual install.. remember to checkout correct version +# git clone https://chromium.googlesource.com/breakpad/breakpad +# git clone https://chromium.googlesource.com/linux-syscall-support breakpad/src/third_party/lss + +# Commit used to make this zip breakpad_20181113.tar.gz +# breakpad +# commit 66571f4838b2306161f072555cb199049bc68142 (HEAD -> master, origin/master, origin/HEAD) +# linux-syscall-support +# commit 93426bda6535943ff1525d0460aab5cc0870ccaf (HEAD -> master, origin/master, origin/HEAD) + +# This script installs breakpad. + + +. "$PSScriptRoot\helpers.ps1" + + +$breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae" +$breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz" +$breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar" +$breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c" + +$linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf" +$linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz" +$linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar" +$linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4" + +$targetBreakpad="$env:tmp\$breakpad_tar" +$targetSyscall="$env:tmp\$linux_syscall_support_tar" +$installFolder = "C:\Utils" + +# breakpad +try { + Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad + Verify-Checksum $targetBreakpad $breakpad_tar_sha + Extract-tar_gz $targetBreakpad $installFolder + Remove-Item -Path $targetBreakpad + # linux-syscall-support + Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall + Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha + Extract-tar_gz $targetSyscall "$env:tmp\" + New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss" + Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss" + Remove-Item -Path $targetSyscall +} +catch { + Write-Host "Cached download failed: Attempping fallback method eg git." + Set-Location $installFolder + git.exe clone "https://chromium.googlesource.com/breakpad/breakpad" + git.exe clone "https://chromium.googlesource.com/linux-syscall-support breakpad\third_party\ssl" + Set-Location "breakpad" + git checkout $breakpad_commit_sha + Set-Location "src/third_party/lss" + git checkout $linux_syscall_support_commit_sha1 +} + +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" + +# Write HEAD commit sha to versions txt, so build can be repeated at later date +Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt +Write-Output "linux-syscall-support = $linux_syscall_support_tar" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-install-breakpad.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-install-breakpad.ps1 new file mode 100644 index 00000000..9360a326 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/35-install-breakpad.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-breakpad.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/35-install-breakpad.ps1 b/coin/provisioning/qtci-windows-7-x86/35-install-breakpad.ps1 new file mode 100644 index 00000000..9360a326 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/35-install-breakpad.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-breakpad.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/35-install-breakpad.ps1 b/coin/provisioning/qtci-windows-7-x86_64/35-install-breakpad.ps1 new file mode 100644 index 00000000..9360a326 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/35-install-breakpad.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-breakpad.ps1" From 4ddadb9aa3947be976270b0894779a8f2f9fea9d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 21 Sep 2018 10:15:00 +0300 Subject: [PATCH 25/27] Add Qt WebAssembly for all submodules Task-number: QTBUG-63917 Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98 Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ec35a2dd..bdc6e816 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,6 +12,7 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch From 56b801a77e8c16aa3df9737c6d41aa1ca22b82ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 20 Jan 2019 18:03:08 +0100 Subject: [PATCH 26/27] Update submodules on '5.12' in qt5 Change-Id: Ifa9eae2c3cfbd6fd001caf289e5ed360623d45f7 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 093484cd..77aa17d5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 093484cd41e0b727e4f2a33bd753a778e62af819 +Subproject commit 77aa17d543f09802f1d9eade8ab1278b0fba203f diff --git a/qtbase b/qtbase index c365fa49..b1092a7d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c365fa49d85810c6ad09bb5f43b5081cd7543bf1 +Subproject commit b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd diff --git a/qtdeclarative b/qtdeclarative index f0a9c1ef..8fd3cfe7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f0a9c1efe36b952dfe3e802f3ceeee6ed10a65f5 +Subproject commit 8fd3cfe7d0f39a731c585334299f5160ad952df9 diff --git a/qtdoc b/qtdoc index 478c0843..b8e6b128 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 478c0843c48259ce257dea0cf4e383dbb7944c9a +Subproject commit b8e6b12840066923bedd1eeef1e578eab97d3821 diff --git a/qtmultimedia b/qtmultimedia index 0caa716a..4e8e4798 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0caa716a92f8f971813fced4bd9f7d62a53cbcdb +Subproject commit 4e8e47989d96f8d60feec2187e4d9c85adb19c2a diff --git a/qtremoteobjects b/qtremoteobjects index 0295c861..a6df9c84 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0295c86166ae8335d448d26f2ae50d542f6e133b +Subproject commit a6df9c84a667e89bcdf215c7ac21b943b07991bd diff --git a/qtrepotools b/qtrepotools index 4712e59d..bb13c8f9 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4712e59d75bb95cb206aff4a6bc111c7c79b06a5 +Subproject commit bb13c8f9ce616e76ef9ec604bb8f26c7a9c00e8d diff --git a/qttools b/qttools index 2ed52386..a7bac543 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2ed52386508ae6c674dd58d928cc0cffff98287e +Subproject commit a7bac5437c59b53887c25b3c0d6ecf0689859c39 diff --git a/qtwayland b/qtwayland index 701a7773..9fbaa5c1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 701a7773e383816ccdfe37a48b766f4bb6c16851 +Subproject commit 9fbaa5c13cfb9712273586abbb708eff07df60a5 diff --git a/qtwebengine b/qtwebengine index d9548e2f..3f7ea91e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d9548e2f13bc83fef0db4d2619e5ac7279787f0c +Subproject commit 3f7ea91e23d82e676aeaf157736e25cf54e5ec6b diff --git a/qtwebview b/qtwebview index 5f219dd5..161e4ec3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5f219dd53bb87da9e07a65177c9bdfb289f7d14e +Subproject commit 161e4ec3af7d6c952f1a4b3c44ec6722dc1c0a18 From 47d14b365ed7ee6b174d48c9cb14d72c66c26d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 22 Jan 2019 15:24:28 +0200 Subject: [PATCH 27/27] Accept license in Android SDK provisioning A change in Android SDK prompts us now for accepting license. Task-number: QTQAINFRA-2591 Change-Id: I1ff05d84ccda743649c6d38784c6170e08f50eb1 Reviewed-by: Liang Qi --- coin/provisioning/common/windows/android.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 90c33fbd..1b4dd35d 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -85,7 +85,7 @@ if (IsProxyEnabled) { # Remove "http://" from the beginning $proxy = $proxy.Remove(0,7) $proxyhost,$proxyport = $proxy.split(':') - $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" " + $sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`"" } New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses @@ -95,9 +95,10 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 # Get a PATH where Java's path is defined from previous provisioning [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process") -$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion" -Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args" cd $toolsFolder\bin\ +$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" +$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' +iex $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android"