diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1177086a..c703555c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,33 +94,33 @@ Configurations: Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'TvOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'WatchOS_ANY' Target arch: 'multi' Compiler: 'Clang' diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 9be84e38..9ce8b73b 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -33,21 +33,40 @@ ## ############################################################################# -set -ex +set -e + + +. $(dirname "$0")/../../common/unix/DownloadURL.sh + + +localRepo=http://ci-files01-hki.intra.qt.io/input/docker +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 + +echo ' + f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb + ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb + 09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb +' \ + | xargs -n2 | while read sha f +do + DownloadURL $localRepo/$f $upstreamRepo/$f $sha +done + +sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y sudo usermod -a -G docker $USER sudo docker --version -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + $localRepo/$f \ + https://github.com/docker/compose/releases/download/1.24.1/$f \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose sudo docker-compose --version +rm ./docker-compose* # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index ac1fd971..5bafc33d 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -89,7 +89,14 @@ DownloadURL () { url=$1 url2=$2 expectedHash=$3 - targetFile=$4 + # Optional argument $4: destination filename + if [ x"$4" = x ] + then + # defaults to the last component of $url + targetFile=$(echo $url | sed 's|^.*/||') + else + targetFile=$4 + fi if VerifyHash "$targetFile" "$expectedHash" then diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh new file mode 100755 index 00000000..89adbd5c --- /dev/null +++ b/coin/provisioning/common/unix/python_modules.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# needed by packaging scripts +pip3 install bs4 +pip3 install sh diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index f1b5e6b5..24a4d507 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,14 +38,14 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.4.3" +version="6.5" # Branch version without dot -qtBranch="512x" +qtBranch="513x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-$version-qt$qtBranch-linux64.run" +squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" if uname -a |grep -q Darwin; then - squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" + squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" diff --git a/coin/provisioning/common/windows/09-install-openssl.sh b/coin/provisioning/common/windows/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/common/windows/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 0c548e63..ce1abdd5 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -68,8 +68,7 @@ try { Verify-Checksum $javaPackage $sha1 Run-Executable "$javaPackage" "/s SPONSORS=0" -Write-Host "Cleaning $javaPackage.." -Remove-Item -Recurse -Force -Path "$javaPackage" +Remove "$javaPackage" Write-Host "Remove Java update from startup" reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 index 258c6c59..fee550b1 100644 --- a/coin/provisioning/common/windows/install_telegraf.ps1 +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -49,7 +49,7 @@ if (Is64BitWinHost) { $filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename $url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename $tempfile = "C:\Windows\Temp\" + $filename diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 2cc45785..f8d600d7 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,10 +38,10 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.4.3" +$version = "6.5" # Qt branch without dot (*.*) -$qtBranch = "512x" +$qtBranch = "513x" # So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. @@ -62,11 +62,7 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 - if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { - $qtBranch = "511x" - } - $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" + $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" diff --git a/coin/provisioning/common/windows/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh similarity index 89% rename from coin/provisioning/common/windows/50-openssl_for_android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh index 81ea3b17..8a3fc7b9 100755 --- a/coin/provisioning/common/windows/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh @@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 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. @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/python-modules.sh +source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index e7cf5c3d..89b1eb7f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a2cbf64 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/python_modules.sh" + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index 2ee4dedf..f0ef3a96 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.2.1.tar.gz 11.2.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh index 09055ee6..241c4c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -38,10 +38,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="10.2.1" -packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +version="11.2" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" -sha1="18fea89bb743107aee372a212be608d6e35fdecf" +sha1="04f288e0dce69ddbce52ea707f978afcbf6be107" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 new file mode 100644 index 00000000..3646d826 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 @@ -0,0 +1,3 @@ +# Needed by packaging scripts +C:\Python36\Scripts\pip3 install bs4 +C:\Python36\Scripts\pip3 install sh diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f90938c4..269771c7 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,10 +43,10 @@ # nmake install -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" -$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" +$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip Verify-Checksum $zip $sha1 @@ -55,6 +55,8 @@ $installFolder = "C:\openssl" Extract-7Zip $zip "C:\" Remove-Item -Path $zip +Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl + Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" diff --git a/qt3d b/qt3d index 906f8a62..31d3ebed 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 906f8a62f89a7ce2343a155e6db62616e66dc14b +Subproject commit 31d3ebed75387b09645fe3f1d36e3b30f686fce3 diff --git a/qtactiveqt b/qtactiveqt index 95f41d5f..3b07b8b2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 95f41d5f24dab973da0a96641e556fac7ae3fa42 +Subproject commit 3b07b8b2f33b0888e20313f52425012b980831c9 diff --git a/qtandroidextras b/qtandroidextras index 2914af23..57aacdd6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2914af23f0691bc04c1bd66faf79b403e68ff8e4 +Subproject commit 57aacdd654a7dec2f8ff412f4f3705d0bd50a0a9 diff --git a/qtbase b/qtbase index d1c6f7e5..84892e5e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1c6f7e5a2e0ee6c50bbf0668e44200bd8469a09 +Subproject commit 84892e5e69e7e44cb1fb77b2ba2338114554a7d2 diff --git a/qtcharts b/qtcharts index de7d5543..57b67d63 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit de7d5543ae093b84a6526cad0d8c56fc12f7526f +Subproject commit 57b67d631dee93f6473786f38504da32fb0bb6b8 diff --git a/qtconnectivity b/qtconnectivity index 17621645..355f09ec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 176216459d84c59bf0cff26203928cfc144f164e +Subproject commit 355f09eccc5ceba421e8c522e04cb7be72fa0a75 diff --git a/qtdeclarative b/qtdeclarative index e87ecaf5..92481660 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e87ecaf55291ac38c705dea7eaeb7c58ad0e3284 +Subproject commit 9248166095b1e3383a43f106219e888b6d43b7d6 diff --git a/qtdoc b/qtdoc index bcb2f180..1e27737f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bcb2f180295962061b0eefcf8010120941200d2a +Subproject commit 1e27737f9e341c6d53dd8a92c2505996c96e3b7d diff --git a/qtimageformats b/qtimageformats index 8ca5b34c..3d157f97 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 +Subproject commit 3d157f9773a2db1a3096a86e5170ace975646ca3 diff --git a/qtlocation b/qtlocation index 0771fa5d..cd7edab9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0771fa5d6476f51c1d2c9874be4958e4b37d10e3 +Subproject commit cd7edab940934fe8b100172e3e62e7eea5c354e5 diff --git a/qtmultimedia b/qtmultimedia index a045c989..49bf444b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a045c989e15feda1201e81d8c2a7a403c33ad6da +Subproject commit 49bf444b44dac10602af0af862f0951835ea5895 diff --git a/qtqa b/qtqa index 62a653d3..0f6a737c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d +Subproject commit 0f6a737ca798ae9c8e0c634715c5cb66681a278a diff --git a/qtquick3d b/qtquick3d index 8bd8254e..2c7d2d46 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8bd8254ee1f3f1f578bb523b43fd949fc22fefd7 +Subproject commit 2c7d2d46bd4ac2cc203be586a760a8f9bc2ac69e diff --git a/qtquickcontrols b/qtquickcontrols index 3432dd2a..dfd79afd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3432dd2a5ffb19144dae39cb1c728b44a48f04f5 +Subproject commit dfd79afda5faf9e732f83715e11dc7aaf5cce164 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc62583e..f9877da4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc62583e8e1f864b8a22fbe79f9fe25ca3a4e9dc +Subproject commit f9877da406ad96d82becb15b6eef9b723b8807e3 diff --git a/qtquicktimeline b/qtquicktimeline index a5c44aee..02b8928d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a5c44aee2d92ed607ce1fc38910d35bd2df5ce9c +Subproject commit 02b8928d42398f963f98e2fa526d14f04f3db429 diff --git a/qtremoteobjects b/qtremoteobjects index ac6b0b0d..419455bf 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ac6b0b0d1ca9fe3f6a61e078db9a30eb5dad6da0 +Subproject commit 419455bfe6e51601504d7c2fa5a2a9dff9c20851 diff --git a/qtrepotools b/qtrepotools index 0028759f..a3d6e9d3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 +Subproject commit a3d6e9d3965ae4d4f97986982b851ef30d091fd5 diff --git a/qtserialbus b/qtserialbus index 15c618da..e333d015 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 15c618da80a71d0f5c33cdade6535f43eb852363 +Subproject commit e333d015458b579768ca229918a3ed426f0e4029 diff --git a/qtserialport b/qtserialport index 09fa8225..d4dc8988 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 09fa8225d525b12ba22234a59452decaf987fb8a +Subproject commit d4dc8988c5cfc6e0080e9ef17f8393a6a06cbb98 diff --git a/qtsvg b/qtsvg index 9aeb3523..e489a325 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9aeb3523a7fc521b725be106b1521335061c43b3 +Subproject commit e489a325769d295ee3b3948d98f5d07814dffd97 diff --git a/qttools b/qttools index c962370b..8437ead5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c962370b3db644bb05c410b2536552466b4eac86 +Subproject commit 8437ead59e73007f05346068ff0979352488a218 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0f6d99c6..6547842b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0f6d99c67b415169153d90844066226ba4d343d2 +Subproject commit 6547842b5ec6f3f13dc0d9fec6c8e4d167bfb2ce diff --git a/qtwayland b/qtwayland index 4cdfa555..c327759b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cdfa55502704d13f3d0cc1f2feccd8807e0c1d4 +Subproject commit c327759b8f1c8fcb6ec70b4266092a38fd1375f6 diff --git a/qtwebchannel b/qtwebchannel index 1f6c72df..b2685b64 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1f6c72df8b33741dc798042dd8c2e75f3af46232 +Subproject commit b2685b64d1f2fef2ef1f3f3542379fb8f052d113 diff --git a/qtwebengine b/qtwebengine index 296469f8..aca2a6df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 296469f8ecef1f4d10cf8c24237fe9397b41f306 +Subproject commit aca2a6df402d6454c7bbe8b0e9816645fcec8342 diff --git a/qtwebglplugin b/qtwebglplugin index 63a47ff1..ef0f5f5e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 63a47ff1f83c64e6865edd61657ad1d636fcae23 +Subproject commit ef0f5f5ed8cdb6dd70f728fd1873158785f43d27 diff --git a/qtwebsockets b/qtwebsockets index 88f408f9..5b34b19b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 88f408f90d760df73c431336ab318b3af66b9572 +Subproject commit 5b34b19b0a37624a3f5846a949112929ef5feeeb diff --git a/qtx11extras b/qtx11extras index b7328240..8dae1423 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b732824096cd3cf31f7a374aa3b92fa934ff9ecd +Subproject commit 8dae14239247281ce36a9e92308a506f149574db diff --git a/qtxmlpatterns b/qtxmlpatterns index 8bb4665c..9e7745d7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8bb4665cccbe0b00cf234917e4fd59394705f46f +Subproject commit 9e7745d7e283570ca8504909d20c39d3aca18cf7