diff options
80 files changed, 476 insertions, 414 deletions
diff --git a/.gitmodules b/.gitmodules index f38a0aa1..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.1 + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.1 + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.1 + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.1 + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.1 + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.1 + branch = 5.12 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12.1 + branch = 5.12 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.1 + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.1 + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.1 + branch = 5.12 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.1 + branch = 5.12 status = addon diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ec35a2dd..3959e24a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic @@ -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 diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 5a189f25..9b3b4cd8 100644..120000 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,22 +1 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-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-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qt5.txt
\ No newline at end of file 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/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt new file mode 100644 index 00000000..ec14f610 --- /dev/null +++ b/coin/platform_configs/qtsaferenderer.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples 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/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 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" 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/linux/open62541.sh b/coin/provisioning/common/unix/install_protobuff.sh index 962e8963..59e9b699 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -1,8 +1,8 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -33,41 +33,43 @@ ## ############################################################################# -set +e +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" -# shellcheck disable=SC1090 +# This script will install Google's Protocal Buffers which is needed by Automotive Suite -# 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 +version="3.6.1" +sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip" +externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +targetDir="$HOME/protobuf-$version" +targetFile="$targetDir.zip" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +unzip "$targetFile" -d "$HOME" +sudo rm "$targetFile" -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 +# devtoolset is needed when running configuration +if uname -a |grep -qv "Darwin"; then + export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" +fi -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" .. +echo "Configuring and building protobuf" +cd "$targetDir" +if uname -a |grep -q Darwin; then + ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else + ./configure +fi make - sudo make install -sudo /sbin/ldconfig -SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH" +# Refresh shared library cache if OS isn't macOS +if uname -a |grep -qv "Darwin"; then + sudo ldconfig +fi +sudo rm -r "$targetDir" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..cf144c90 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination 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_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" - # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" 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" 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/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1 new file mode 100644 index 00000000..fd3fb3d3 --- /dev/null +++ b/coin/provisioning/common/windows/install-protobuf.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Google's Protocol Buffers +# Script requires Cmake to be installed and strawberry-perl not to be installed + +$version = "3.6.1" +$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" +$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip" +$zip = "C:\Utils\protobuf-all-$version.zip" +$installationFolder = "C:\Utils\protobuf" + +Write-Host "Installing Protocol Buffers" +Add-Path "C:\CMake\bin" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build" +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release" +New-Item -ItemType directory -Force -Path "$installationFolder" +cd "C:\Utils\protobuf-$version\cmake\build\release" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install" +if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){ + Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!" + exit 1 +} + +Remove-Item "$zip" + +Add-Path "$installationFolder\bin" +Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include" +Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib" diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/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/common/windows/opcua_unifiedautomation.ps1 b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 index aff784b9..70fcaae0 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. @@ -33,27 +33,58 @@ . "$PSScriptRoot\helpers.ps1" -$zip = Get-DownloadLocation "uasdkcpp.zip" -$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022" -$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.5.6-361.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.5.6-361.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" 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/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[@]}" 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-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh index 21c926b8..a77938b3 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh @@ -1,8 +1,8 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -33,5 +33,8 @@ ## ############################################################################# -# shellcheck source=../common/linux/open62541.sh -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" +set -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + 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 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/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" 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-linux-RHEL-7.4-x86_64/50-open62541.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh index 21c926b8..a77938b3 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh @@ -1,8 +1,8 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -33,5 +33,8 @@ ## ############################################################################# -# shellcheck source=../common/linux/open62541.sh -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" +set -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index b70a8a78..d9caff91 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment.p12" -shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" +iPhoneDeveloper="iosdevelopment_2019.p12" +shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution.p12" -shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" +iPhoneDistribution="iosdistribution_2019.p12" +shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh b/coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 index a4b63493..2ad25685 100755..100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1 @@ -1,8 +1,7 @@ -#!/bin/env bash - ############################################################################# ## ## 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. @@ -33,4 +32,13 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" +. "$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" 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 index 25c6f28a..25c6f28a 100644 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 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/30-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 index 69799974..69799974 100644 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 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-10-x86_64/92-install-protobuf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 new file mode 100644 index 00000000..8bcdf3fa --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-protobuf.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/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 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" diff --git a/qt3d b/qt3d -Subproject a0496abe3890766638e8601c4bd11ba1755138e +Subproject 3c68eeac236b2e33cf34d2f23e04a8d156118eb diff --git a/qtactiveqt b/qtactiveqt -Subproject fe276a86f0dff5f817a76a351271f600be0e711 +Subproject 4766c93e4df91ee3ecf510b5f011799e29f6093 diff --git a/qtandroidextras b/qtandroidextras -Subproject 4505f993f74b21f06ac46b6448a2408048bfd2d +Subproject 1c7de1701f1f75c2ce6cfff1baa6ab49ee66907 diff --git a/qtbase b/qtbase -Subproject 0c498153331d79715ecfe431eb27065748628ba +Subproject 850c922036b7eebc24cdb74a43a4b31319d924c diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 101fdeb344af67a65ae801248cccc11b9b576b8 +Subproject 18e0ed4fecb9642464c989a6c716a2b5cf40010 diff --git a/qtcharts b/qtcharts -Subproject 5ea5bc7413901375a112f482fae365bfebd7c8a +Subproject 9da68921e4bfb9c362600832b23128d488dc7af diff --git a/qtconnectivity b/qtconnectivity -Subproject 736d3e14bbf28c90ff51c017ceea6c2bc0c7698 +Subproject 370e84c6d5f7c4f2d3f274ccb250f4baccd4614 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 7f661ab61611d48f4491c1fa9d7932e822e9b05 +Subproject 54adef94a3e9f6112fc74c59bde2b122bcb0e6e diff --git a/qtdeclarative b/qtdeclarative -Subproject a566125b9fcc023237b442e5b9a838d40455c8f +Subproject d27d896d8cb9d240138fe8ea69f1051f74ce194 diff --git a/qtdoc b/qtdoc -Subproject f7f5859f46158be778222ee1b4fcfff5fc8361d +Subproject 2e9adec0f0d929d971d3da1c7f1f170930fc7ae diff --git a/qtgamepad b/qtgamepad -Subproject 1f15fda174b53bc6dcaa19653dd5a791b4cbb4b +Subproject 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba3 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 2c15783c02e3abfc3c528d270c448d1d555c803 +Subproject 56a4a58c999e03385bad6ab052f87ffe2c63500 diff --git a/qtimageformats b/qtimageformats -Subproject 3987e304dfa458457767fbe8b8a3d351dbb3b2c +Subproject 0e8422bedc8c84ff7c08c6b3163329e82c2007d diff --git a/qtlocation b/qtlocation -Subproject bfb88b7a87e5dbed77d25998e386f8b5cc4e21d +Subproject dc384a2376a13ae2a8776ea0eda7d6e2fd088a6 diff --git a/qtmacextras b/qtmacextras -Subproject ee7ebf396fcb806d1022bdea0ffe5f0c632b8f3 +Subproject 18594a3928dbc82597cf6d9fb90ca07d2a67bcb diff --git a/qtmultimedia b/qtmultimedia -Subproject 10ac932185707f0084cec7b1cfe0a6a2073b20a +Subproject dee506f70536dd10f3e00c42f685ead9283433b diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 410c82cdd09bbcc2f236f8c2e85af726b197690 +Subproject 2d58e369ed692c8a7e639919d15ff6299a76f81 diff --git a/qtpurchasing b/qtpurchasing -Subproject 9b316440eeabee1c3220241c3eb79954f1dc91b +Subproject 7f9e30e242a7ba02501f24eb9ff7fdb3028783e diff --git a/qtqa b/qtqa -Subproject 7bedbd3bbf6e51f8a360b412c1563fcc0a8e0d8 +Subproject db96580caaf0e3503a9ab8697f95e8e3b96aa57 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 9b88ca4f033135f1a60871873da7f0732bc19d4 +Subproject d049f759c6f897db528ca549435c56b4420b016 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ef34964c1fd6ae361da5a6b540f6448cf090e57 +Subproject 1d29b1e36732a7d17ed34c5fa207e7b935f2f41 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject e1c0dbeadcfd34699f080edc49815761672616c +Subproject d3cde521533787f5f91364ffdba3e0a386d131f diff --git a/qtrepotools b/qtrepotools -Subproject bb13c8f9ce616e76ef9ec604bb8f26c7a9c00e8 +Subproject 21dab1c69e16fd8dcfb9564211b31885d628d59 diff --git a/qtscript b/qtscript -Subproject 6c51f94f5cd9afc90d5b28071c8a3ba9983d285 +Subproject 5a9de40f48f5854b6ff20329ced0f0509b81b48 diff --git a/qtscxml b/qtscxml -Subproject e64b9a5d33b6f13fce93a553661c29a8a490108 +Subproject 01399f9600174a0c77ffc57d32c07ce0698952e diff --git a/qtsensors b/qtsensors -Subproject 83e59fedc5099168c4c1682f63b0e49a2ba61a2 +Subproject 7792137f3fcd400f3933e8f7f328b35aa0586f8 diff --git a/qtserialbus b/qtserialbus -Subproject c6ff631f832f0e4f5aa703cd952530341ab7429 +Subproject 670f912fbc08002ac063504755fc7705931e0d6 diff --git a/qtserialport b/qtserialport -Subproject 938fdd74f17d8f0e03b491bd0093340b90f52ff +Subproject b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe diff --git a/qtspeech b/qtspeech -Subproject 935b2b051ca94dd1dabc5e5f57e77914cd2099f +Subproject 0711336d26804898393a99640e1442df7fd3828 diff --git a/qtsvg b/qtsvg -Subproject 71ddbcf502c5dafdcb98aa00c87fcf419aaa9b9 +Subproject 74f7566527c6ed3c47fac873e90942f2834d248 diff --git a/qttools b/qttools -Subproject 61383ceca69001c292b31188b04fba304f8fbbb +Subproject d264cde2c754a683a723a2b5aad9b634a07eea2 diff --git a/qttranslations b/qttranslations -Subproject c36807f030790ed9bcf9e790d02f765d67d2b8e +Subproject 6431236ba6506c0eb9263e2b14d8b84d7716b12 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 6f668860ede55d261a53163bc1a3956f84dd9d6 +Subproject c099fef8041f6cfd56e789b86c70a802c894da3 diff --git a/qtwayland b/qtwayland -Subproject d296dea131ad51cfb4809e9a5e2d6908b2844a5 +Subproject 5f645af22bb63f0d215294535cf683029ed7aab diff --git a/qtwebchannel b/qtwebchannel -Subproject b2d34596a1ed3cd1844eaa9ef3a338e12104ba3 +Subproject d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e diff --git a/qtwebengine b/qtwebengine -Subproject dde9bbb40ceed6409862e4cd31091270f99ea34 +Subproject 31730085ee9247864a5da5682939eb399853f98 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject c76e2a37310f1e94002488fe33d56d6b00f2d62 +Subproject 3154a358e2988aa9aafd4ecd8c43c8bcc7c1605 diff --git a/qtwebsockets b/qtwebsockets -Subproject ef876a7d2964f53faf160af2b01798e930dfaa9 +Subproject 9a0a655b51086045ce86c9d001d34738d84d27f diff --git a/qtwebview b/qtwebview -Subproject 85cf48d62a20652b150ce29b78c269d4937edf7 +Subproject 17334eb56b42114927169ee8eec6512754674fb diff --git a/qtwinextras b/qtwinextras -Subproject cd9b2c76cd3f76e1011ae89c34bed4d4ee0ec58 +Subproject f2dc1d1a2df6bc728c0f65b4e4c59025d605751 diff --git a/qtx11extras b/qtx11extras -Subproject 857c981c6c4c9a9a1b242225d869e9c40861ba3 +Subproject 165286899e3426730e5dfcd155f92b571c97841 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject fe5b5faf66f6e752f8425fd56326f47fd4888b7 +Subproject 5e2450f4559f03a480e37318084bab99fdc128f |