diff options
119 files changed, 218 insertions, 258 deletions
diff --git a/.gitmodules b/.gitmodules index 3d8128eb..d68fd180 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = 5.11 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = 5.11 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = 5.11 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = 5.11 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = 5.11 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = 5.11 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = 5.11 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = 5.11 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,114 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = 5.11 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = 5.11 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = 5.11 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = 5.11 + status = preview +[submodule "qtopcua"] + depends = qtbase + path = qtopcua + url = ../qtopcua.git + branch = 5.11 status = preview diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5553d7b8..31a71e98 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,6 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic @@ -23,5 +22,5 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck -qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3a3af1fe..0789b1fb 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic @@ -14,13 +12,12 @@ qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packagin qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 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 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/common/linux/open62541.sh index 202d072d..bde5b0de 100644..100755 --- a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 +++ b/coin/provisioning/common/linux/open62541.sh @@ -1,9 +1,11 @@ +#!/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. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -30,22 +32,20 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# Install Visual Studio 2013 update 5 - -$version = "2013 Update 5 (KB2829760)" -$package = "C:\Windows\Temp\vs12-kb2829760.exe" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" -echo "Fetching patch for Visual Studio $version..." -Copy-Item $url_cache $package -$commandLine = $package +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR -echo "Installing Update 5 for Visual Studio $version..." -. $commandLine /norestart /passive +pip install six -echo "Removing $package ..." -remove-item $package +git clone https://github.com/open62541/open62541.git open62541 +cd open62541 +git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +mkdir build +cd build +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +make -echo "Visual Studio = $version" >> ~\versions.txt +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 5901b634..584c91a8 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -59,6 +59,7 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then fi rm -rf $targetFile + # Set env variables SetEnvVar "QNX_700" "$targetFolder$folderName" diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 4248d0ed..b24de870 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -116,6 +116,7 @@ function Add-Path $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } function is64bitWinHost diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1 index c08748d8..be0f7277 100644 --- a/coin/provisioning/common/windows/icu.ps1 +++ b/coin/provisioning/common/windows/icu.ps1 @@ -39,51 +39,7 @@ $version = "53_1" if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { - $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" - $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" - $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" - - $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 - Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013 - Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""} - - echo "Cleaning $icuPackage_msvc2013_64..." - Remove-Item -Recurse -Force $icuPackage_msvc2013_64 - - echo "ICU MSVC2013 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") - # FIXME: do we really want to use the 4.8.2 ICU build? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") -} else { - - $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" - $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" - $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" - - $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 - Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32 - Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""} - - echo "Cleaning $icuPackage_msvc2013_32..." - Remove-Item -Recurse -Force $icuPackage_msvc2013_32 - - echo "ICU MSVC2013 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") - } diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 9609336e..f3e96318 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -58,7 +58,7 @@ function InstallMinGW Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} echo "Adding MinGW environment variable." - [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine) echo "Cleaning $mingwPackage.." Remove-Item -Recurse -Force "$mingwPackage" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 208d1ed4..5a25d2eb 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,29 +4,39 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' } +$zip = "c:\users\qt\downloads\libclang.7z" +$baseDestination = "C:\Utils\libclang-" + $libclang_version if ( $archVer -eq 64 ) { $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" -} else { - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" + $destination = $baseDestination + "-64" + + Download $url $url $zip + Verify-Checksum $zip $sha1 + + C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ + Rename-Item C:\Utils\libclang $destination + del $zip } -$zip = "c:\users\qt\downloads\libclang.7z" -$destination = "C:\Utils\libclang-" + $libclang_version +$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" +$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" +$destination = $baseDestination + "-32" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ Rename-Item C:\Utils\libclang $destination - -[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine) del $zip + +[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $baseDestination + "-_ARCH_", [EnvironmentVariableTarget]::Machine) echo "libClang = $libclang_version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/win10-enable-devmode.ps1 b/coin/provisioning/common/windows/win10-enable-devmode.ps1 new file mode 100644 index 00000000..2d7733c0 --- /dev/null +++ b/coin/provisioning/common/windows/win10-enable-devmode.ps1 @@ -0,0 +1,16 @@ +# Turning on developer mode. +# +# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines. +# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development + +if ([environment]::Is64BitOperatingSystem) { + $bitness = "/reg:64" +} else { + $bitness = "/reg:32" +} + +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F $bitness +if ($LastExitCode -ne 0) { + Write-Host "Could not enable Developer Mode." + exit 1 +} diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh index 447e7b1f..6cc2b44f 100644..100755 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh @@ -1,9 +1,11 @@ +#!/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. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -30,21 +32,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# Install Visual Studio 2013 update 5 - -$version = "2013 Update 5 (KB2829760)" -$package = "C:\Windows\Temp\vs12-kb2829760.exe" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" - -echo "Fetching patch for Visual Studio $version..." -Copy-Item $url_cache $package - -echo "Installing Update 5 for Visual Studio $version..." -Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait - -echo "Removing $package ..." -remove-item $package -echo "Visual Studio = $version" >> ~\versions.txt +source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index d15e0059..1a679695 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -103,6 +103,10 @@ try installPackages+=(python3-dev) installPackages+=(python3-pip) installPackages+=(python3-virtualenv) + # Needed to be able to build Yocto + installPackages+=(chrpath) + installPackages+=(gawk) + installPackages+=(texinfo) # Automates interactive applications (Needed by RTA to automate configure testing) installPackages+=(expect) installPackages+=(mesa-common-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh new file mode 100755 index 00000000..3d294fef --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh index 3ccb412d..6570e107 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -41,10 +41,11 @@ trap "sudo rm -fr $TEMPDIR" EXIT cd $TEMPDIR git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua cd freeopcua -git checkout ca75e05a8e63d88dbfc259e1251f405106411b66 +git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b mkdir build cd build source ~/.profile cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. make sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh index 632859a0..6cc2b44f 100644..100755 --- a/coin/provisioning/common/windows/patch_qnx.ps1 +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh @@ -1,6 +1,8 @@ +#!/bin/env bash + ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -31,21 +33,4 @@ ## ############################################################################# -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip - - -. "$PSScriptRoot\helpers.ps1" - -$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" -$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" -$tempDir = "C:\temp\qnx_path" - -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip -Verify-Checksum $zip $sha1 -Extract-Zip $zip $tempDir -Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force -Remove-Item $tempDir -recurse +source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/common/windows/install-qnx660.ps1 b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index bf9c9d09..7f24d224 100644..100755 --- a/coin/provisioning/common/windows/install-qnx660.ps1 +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -1,9 +1,11 @@ -############################################################################ +#!/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. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -31,16 +33,6 @@ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" - -# This script will install QNX 6.6.0 - -$version = "6.6.0" -$nondottedversion = $version -replace '[.]','' -$targetFolder = "c:" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" - -Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} +set -ex -[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") -echo "QNX = $version" >> ~\versions.txt +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.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 new file mode 100755 index 00000000..6cc2b44f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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-RHEL-6.6-x86_64/50-patch_qnx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh index 6f998a60..a039654a 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/bash ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -33,32 +33,47 @@ ## ############################################################################# -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip +# This script installs QNX 7. -set -ex -sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" -function InstallZipPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +folderName="qnx700" - targetFile=`mktemp` - wget --tries=5 --waitretry=5 --output-document=$targetFile $url - echo "$expectedSha1 $targetFile" | sha1sum --check +ExceptionExtract=100 +ExceptionExtract2=101 - tempDir=`mktemp -d` - /usr/bin/unzip -o -d $tempDir $targetFile - trap "sudo rm -fr $targetFile $tempDir" EXIT - sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ -} +try +( + sudo mkdir -p "$targetFolder" + + echo "Extracting QNX 7" + sudo unzip -q "$sourceFile" -d "$targetFolder" || throw $ExceptionExtract + + sudo chown -R qt:wheel "$targetFolder"/"$folderName" -echo "Patching QNX" + # Verify that we have last file in zip + if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + throw $ExceptionExtract2 + fi + + # Set env variables + echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc + echo "QNX SDP = 7.0.0" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionExtract) + echo "Failed to unzip QNX 7." + exit 1; + ;; + $ExceptionExtract2) + echo "The last file in the zip did not get extracted." + exit 1; + ;; + esac +} -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" -InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index 684816f0..00392e4c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -1,9 +1,9 @@ . "$PSScriptRoot\..\common\windows\install-mingw.ps1" -# This script will install MinGW 5.3.0 +# This script will install 64-bit MinGW 5.3.0 -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" +$release = "x86_64-5.3.0-release-posix-seh-rt_v4-rev0" +$sha1 = "7EB12DD3EDDCF609722C9552F8592BD9948DA1FC" InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index 27612c49..2986db90 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -1,8 +1,8 @@ . "$PSScriptRoot\..\common\windows\install-mingw.ps1" -# This script will install MinGW 6.3.0 +# This script will install 64-bit MinGW 6.3.0 -$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" -$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" +$release = "x86_64-6.3.0-release-posix-seh-rt_v5-rev2" +$sha1 = "49E7F8997E3D15C75B1A4DE1C380ABE1FB9B7533" InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 deleted file mode 100644 index 2a71fd55..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-qnx660.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 deleted file mode 100644 index de486c97..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 deleted file mode 100644 index de486c97..00000000 --- a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 deleted file mode 100644 index af05e838..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 deleted file mode 100644 index 51eb0b2b..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 deleted file mode 100644 index 5bf811ef..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 deleted file mode 100644 index e2e9be9c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 deleted file mode 100644 index eed6b734..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 deleted file mode 100644 index 1b1a07e9..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 deleted file mode 100644 index b9d8153e..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 deleted file mode 100644 index 38106de7..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 deleted file mode 100644 index 15065b55..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 deleted file mode 100644 index 3ad5b9fd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 deleted file mode 100644 index 28299307..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 deleted file mode 100644 index 331de489..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 deleted file mode 100644 index 875b426f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 deleted file mode 100644 index 2b5756be..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 deleted file mode 100644 index eca19011..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 deleted file mode 100644 index d57ad1cd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 deleted file mode 100644 index 451d2452..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 deleted file mode 100644 index 7918fabf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 deleted file mode 100644 index 074a7a6d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 deleted file mode 100644 index 73dc7bc2..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 deleted file mode 100644 index b246ce25..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 deleted file mode 100644 index 455d92bf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 deleted file mode 100644 index af05e838..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 deleted file mode 100644 index 51eb0b2b..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 deleted file mode 100644 index 5bf811ef..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 deleted file mode 100644 index e2e9be9c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 deleted file mode 100644 index eed6b734..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 deleted file mode 100644 index 1b1a07e9..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 deleted file mode 100644 index b8c1ce9f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 deleted file mode 100644 index 38106de7..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 deleted file mode 100644 index 15065b55..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 deleted file mode 100644 index b6e3582c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 deleted file mode 100644 index 3201032d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 deleted file mode 100644 index 331de489..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 deleted file mode 100644 index 875b426f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 deleted file mode 100644 index 2b5756be..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 deleted file mode 100644 index eca19011..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 deleted file mode 100644 index d57ad1cd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 deleted file mode 100644 index 451d2452..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 deleted file mode 100644 index 7918fabf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 deleted file mode 100644 index 074a7a6d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 deleted file mode 100644 index 71deb0d4..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 deleted file mode 100644 index 73dc7bc2..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 deleted file mode 100644 index b246ce25..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 deleted file mode 100644 index 455d92bf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/qt3d b/qt3d -Subproject e2e162b9ca122e68c444b536888f30c6f1c10de +Subproject 598acd70a44f787a3e72c586576bfc028d5af02 diff --git a/qtactiveqt b/qtactiveqt -Subproject 50578d3893c611b3a33bbd8239a126f2b8f234b +Subproject 6ddc5720d0bc03f72bd47718a37294ca7c211d8 diff --git a/qtandroidextras b/qtandroidextras -Subproject 5794f3130cb1894ea3d8143c2c89de23886d9c1 +Subproject bb3c2b9090bd1e1c9664492413c05fedbde575f diff --git a/qtbase b/qtbase -Subproject e39a9de3309f84be4101da839a0bacf69090706 +Subproject efec288f58dc18f6a571bfedf9d19e3fbf12a18 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject b742b8f1b654bd185244973f7bae60da951d41a +Subproject b3d1613d1c2eb2f942336c27b4e760e45f18c7c diff --git a/qtcharts b/qtcharts -Subproject 47f3f659d2c4bae874f78998aece8145605bfd5 +Subproject c844c1e5bde966c50a41d43c942b806d5c2f251 diff --git a/qtconnectivity b/qtconnectivity -Subproject b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83 +Subproject 1653ae6e8782fb96999a53736a773e9a31d86b8 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 63b90a1d334743b63f396331434e9b12e366f9d +Subproject 8b0018cb1a4dea8e74de01427d79494a68d843c diff --git a/qtdeclarative b/qtdeclarative -Subproject 2570b801c74832a3c83a8b56ad0f76812969e19 +Subproject c4f1a676fcaad76829c7cda1f5bea018150b741 diff --git a/qtdoc b/qtdoc -Subproject ea25c59aa9e6d7ef69ba6e06a1509042b4af0d5 +Subproject 00f151953dbb4d9e50eebcaedce9866977e22a1 diff --git a/qtgamepad b/qtgamepad -Subproject 544d3e4f6f42771b38cafd8a200b16299f2d102 +Subproject 0ed771f5045729052cef906475395dc8ced3fc8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 66031e932c321ccb936e254b5d1810fa633c6cb +Subproject 586476ff2ce59ba4ea2cee2ab59818e0bda4b90 diff --git a/qtimageformats b/qtimageformats -Subproject 54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba0 +Subproject a10fec1d386efd99f95973c7d446f94622a5da5 diff --git a/qtlocation b/qtlocation -Subproject 9283a290040fd55f7eb34580b99f771d4facdeb +Subproject 38e72f68316b2a28c4949b2701a23f1e5ed3ccf diff --git a/qtmacextras b/qtmacextras -Subproject c190b14ae3ce5ffd2701b457ec8da1b32820be7 +Subproject d05fbba64263917e997d49d152747de2574c804 diff --git a/qtmultimedia b/qtmultimedia -Subproject a3fb242676055355deb68788199ae59abe58ca4 +Subproject 009a9d4b5d32fa73aca6cabe7d45d6a9bbae003 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd +Subproject 1a251f8fcf2749604dc15a4d7d2ceb636daac61 diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject 74a6a38411c37a670e70c3292eab2b9071d7719 diff --git a/qtpurchasing b/qtpurchasing -Subproject 49c5461af0888950b80eb9558647ccd764d5573 +Subproject a78241bf0df8eef6dec1d935892697e01ae5e65 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 698a8268f786d74726eb07255df2d26ac226907 +Subproject 4459886e3f949821425dd5fd9fc9da0416d0ffc diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ac6f4903aeb2e8399b5aa538b35a760f0392568 +Subproject 3323ca8e627db560665edb667e52d52233c0560 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject c26dd694e8374b478bf428bc9e8753cfc0c3a52 +Subproject cd58e66b974b6ed06d23dff565a3f29a76a5574 diff --git a/qtscript b/qtscript -Subproject 84b13fd9fcd85d39411150f8ae46916a048c413 +Subproject a002116ece257e2a2a1e6047c43652073806917 diff --git a/qtscxml b/qtscxml -Subproject be2cb77f0c882444d4d1080953b4d1b961973c0 +Subproject ac1bc572a22ed3de61076e2b8f27dea52171ddc diff --git a/qtsensors b/qtsensors -Subproject fb382442ccf1a8e926687b3cfa163ccbca479c4 +Subproject 0a6b30351a0e80447c2dd683765fc1fe66c1eda diff --git a/qtserialbus b/qtserialbus -Subproject b65de45fbfa08d0d2d5b89df77181d372659809 +Subproject 1399a77954ec4b40fa14b75218e046e76d1324b diff --git a/qtserialport b/qtserialport -Subproject 7c827dcbf82d5e5bfbba4053a32c54413a95182 +Subproject 3f8222efa943617994d982bf31fcda5e568952c diff --git a/qtspeech b/qtspeech -Subproject f5aaee80166be7969a71496d2fd9a8152d8effb +Subproject 0b3b3431429efd7f7aca751afeeb862c1ff4f9f diff --git a/qtsvg b/qtsvg -Subproject 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8 +Subproject 4366fe95477f96489f9a7a99df96230f0ac7211 diff --git a/qttools b/qttools -Subproject 3c7675d9609a15bea81884560920bded736f79a +Subproject 135482d36409b5763292c1bf92a8bae7b8322bb diff --git a/qttranslations b/qttranslations -Subproject c3486e072ebc704f9c82c005044143b07bb88f1 +Subproject e65c3e30bc56242bee353d4d28f9cf97c9af8a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 1a9158bfbdd8dd01bac591c11bb0d0bf46514dd +Subproject d3f40bea1b424f60b178faf6bcb45927ce56e08 diff --git a/qtwayland b/qtwayland -Subproject 06230d22488796d92ea130e985d1e0ee2ed0519 +Subproject 7a9d0f9d0a852c727aef5a54ceeb51b7b2dda85 diff --git a/qtwebchannel b/qtwebchannel -Subproject a2b88f9ba0ce2e03ffa73ba26e910e988db5d6c +Subproject f1a65fe2e8294f9a42f360cf13539735211e587 diff --git a/qtwebengine b/qtwebengine -Subproject d502c6e9d09803dd268100f8c53cf7bc563e3d1 +Subproject 2daa4950118dd76d0d0bf15e347217740b0cb5c diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 235150a1909b9d666acbdb541c665a19cc474c0 +Subproject 76e27b8f62afba31a2c675eba4445308eaf47df diff --git a/qtwebsockets b/qtwebsockets -Subproject f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec +Subproject b0fe74a5b924646568291b5ce65e7d13bccbc73 diff --git a/qtwebview b/qtwebview -Subproject eef3467cfad9f6ad892344bfcadbd59b5bcb4f5 +Subproject 71be1de8162f38fc544605743a0169e10a19dc3 diff --git a/qtwinextras b/qtwinextras -Subproject a346f1d1cdc997948d1fc84ca65031463f1b86a +Subproject c23635538f51eaa5e0b9beedb391b014f7e2d4c diff --git a/qtx11extras b/qtx11extras -Subproject fcd1d9a09d22619dfae4c1d4f9911e9acce2e89 +Subproject 7eae66f6693e560b01c03907bfeccb1deac7aed diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 0a84ad44ff5b793316485fd992326627a70fda8 +Subproject a67c761d96dbfe78a63b12d48445091aa58edf3 |