diff options
118 files changed, 207 insertions, 260 deletions
diff --git a/.gitmodules b/.gitmodules index 3d8128eb..1fc98730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = dev status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,114 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = dev status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = dev + status = preview +[submodule "qtopcua"] + depends = qtbase + path = qtopcua + url = ../qtopcua.git + branch = dev status = preview diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index f1634e28..e746c641 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,4 @@ 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 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3a3af1fe..95b13977 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,11 @@ 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 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 73783468..4f7c4fb1 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -56,6 +56,12 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then fi rm -rf $targetFile + # Set env variables -echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export QNX_700=$targetFolder$folderName" >> ~/.profile +else + echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc +fi + echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/common/open62541.sh index 202d072d..bde5b0de 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/common/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/win10-enable-devmode.ps1 b/coin/provisioning/common/win10-enable-devmode.ps1 new file mode 100644 index 00000000..022adc52 --- /dev/null +++ b/coin/provisioning/common/win10-enable-devmode.ps1 @@ -0,0 +1,5 @@ +# 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 +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f6a9fd90..ff781b6c 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 9d857051..af041916 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\..\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/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh index 202d072d..2871ba93 100644..100755 --- a/coin/provisioning/qtci-windows-8.1-x86/09-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,22 +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 -$commandLine = $package - -echo "Installing Update 5 for Visual Studio $version..." -. $commandLine /norestart /passive - -echo "Removing $package ..." -remove-item $package -echo "Visual Studio = $version" >> ~\versions.txt +source "${BASH_SOURCE%/*}/../common/open62541.sh" 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..2871ba93 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/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..2871ba93 --- /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/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/040-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/040-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/enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 new file mode 100644 index 00000000..88f6047b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\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-10-x86_64/enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 new file mode 100644 index 00000000..88f6047b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\win10-enable-devmode.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 1d5f8b8536c1b0165c2292529dc3814e96bb0a2 +Subproject 1d874d33da9174a82fccc266c66a22af006ac8e diff --git a/qtactiveqt b/qtactiveqt -Subproject 851309bd2987b451354780e36112c02d5473482 +Subproject a3a8dd0bf97f77368f5f0262b94115875bd0669 diff --git a/qtandroidextras b/qtandroidextras -Subproject 3317428a98dee4caad6f8e170fb499e4083b242 +Subproject 125c4fdbf4df3e79c84798f55a3d29fa418517c diff --git a/qtbase b/qtbase -Subproject 1623f66989d162faead5200e50b48d079edda3b +Subproject d51dde6c67155f774bb88b9cd64c6b061cfa5d4 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 4cea1fdf84a7618d8d815189881368bb4792648 +Subproject 29e490679e2e3610c62750eb96d9c4b81205cf9 diff --git a/qtcharts b/qtcharts -Subproject 2d962cffd5d6d5b1c40bef8807a2a774cc6fb63 +Subproject 146e375210f406e62fd952d150bc1bcd926d60c diff --git a/qtconnectivity b/qtconnectivity -Subproject e8d9bd63b05b33b22ff5d19fb31ad55b1e40925 +Subproject 4462750a68cb93b5d363b6efdbe1d6a6f0e5811 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 7dd95d1d4cb65662a9bbb739163b7e12f3d81a8 +Subproject 7722638fcd57f2e826bac61c3bf9ab2a7e19008 diff --git a/qtdeclarative b/qtdeclarative -Subproject 2e8a45d99f94cbd2c805dd3de56d60d9baa9bd4 +Subproject 6318a43ffc473ba101c955d96b39bc1b93ef7e6 diff --git a/qtdoc b/qtdoc -Subproject fb00c8932a37e245591c78891b56200917d417a +Subproject cfff119931e775c1d962c6b143e2a2711903bab diff --git a/qtgamepad b/qtgamepad -Subproject ad15ca27280e23dbb07e5622f40cdd85479715d +Subproject 4ca89439b36ba9761879c505072f6bf439da3b5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject eff278540f723f2db3b98caf7fa3af551c61da3 +Subproject 918427086bc3ec992dc8952c33ee743c8a5b92c diff --git a/qtimageformats b/qtimageformats -Subproject c34ab1c43a3cbbaad127eb8bc6fd9b5c90a1169 +Subproject 9839bdba39d7f96de11071b9c6ab4c9c6635a97 diff --git a/qtlocation b/qtlocation -Subproject 30c69a44b0ad671481b5adb2fe997e7f7d56820 +Subproject 0c00f73cebfcfe4308d46c67a6f3345886b9bcc diff --git a/qtmacextras b/qtmacextras -Subproject 6834dc0cfb2e27f53bdbca0e5b69b6f38187456 +Subproject da3e8f7ebb148102d96fb64675009a4a14566a1 diff --git a/qtmultimedia b/qtmultimedia -Subproject b8609cd3ffeddd02a514c6b5f9170c8017966e4 +Subproject ec576ef2a004fc291eb6475c15907f82d425e88 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 8cce9fa16f3531e1e094a798c007480afa2bcaa +Subproject f539a5889320df673b212d07973d7ab2ff03443 diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject 5ef890be7813c8f0c12bb5db75b448d9237c0cb diff --git a/qtpurchasing b/qtpurchasing -Subproject 1f9e8a545dfb0c6a029ecf14d19692a8642be65 +Subproject 415d62017f5167a824838a7b681fc5bf76e6a5b diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 314d1bdf7d56462102639e12d34596cbfd4fce9 +Subproject c053e8aa063fa679b712935cc1495a51f2ddaf6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 772c01c0ced1c3420b2c8fb3ec4b4bbc898b7d6 +Subproject 2cdec3eadc7ac1d1e5c4cd505b60196e44df1a7 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 6eb36c47776e5f4c300f43fd191429af0664b3e +Subproject 73a49c428150c2772e10cf6d8086bb0eb260803 diff --git a/qtscript b/qtscript -Subproject 930a0cd94d06ea7278fc9aa58b637f862a8de35 +Subproject 94b3194bb02bfba8ca3e3dfb76ac8b4207dc365 diff --git a/qtscxml b/qtscxml -Subproject e5b1a29882b8609fc41fd5af56495a408b747a8 +Subproject ac1bc572a22ed3de61076e2b8f27dea52171ddc diff --git a/qtsensors b/qtsensors -Subproject a5881f10e0ba6ba283b1215a534205619666141 +Subproject 032c1e73ef289e64ee38c77faf26c46c7431204 diff --git a/qtserialbus b/qtserialbus -Subproject 5b2d55c0f57c525e58bfe2c4afa80dc012920a1 +Subproject df9735fc1660dd40730693f08f6e046a5e01deb diff --git a/qtserialport b/qtserialport -Subproject 00f3e2df573400c7ee350bc2b2c5e89e50ab27c +Subproject 692a6db62b6c54f518d9e5b4f1f8f134fb3719f diff --git a/qtspeech b/qtspeech -Subproject 964b71d8b92cdbbbbf49ecd2b3fbc55a240f6d4 +Subproject 3eb41567fb539e3b4f640645fe05da7e962ef85 diff --git a/qtsvg b/qtsvg -Subproject b9cddbd84b74fdda30190800ed827dc80aa65f6 +Subproject 8c8ca4a03a701b046990f9023487888d96d113e diff --git a/qttools b/qttools -Subproject 58f0987e16ac4580d9e4a6b604dd7603510b038 +Subproject a9395ee421dee0849541830c6c34d1bae86ed10 diff --git a/qttranslations b/qttranslations -Subproject f54b179a16a2301bac828a97a86b1a3719619d1 +Subproject e65c3e30bc56242bee353d4d28f9cf97c9af8a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject e94108a9b45a5a972e9111a45a27476665484c8 +Subproject d297dfd0641e6608386205d99a0518726c31586 diff --git a/qtwayland b/qtwayland -Subproject 8ab1765b0f9640eb410864971cb4336adc7b30a +Subproject 15f3316709f055f2f723a839d7108ecd15ad397 diff --git a/qtwebchannel b/qtwebchannel -Subproject ee70a3dc1dff15f6fc00ea979ae0c169e201aca +Subproject 0da37161ef304f9b8d45d1ebe396f7758700fe0 diff --git a/qtwebengine b/qtwebengine -Subproject 0b406584b711e5c6e12baeb15e10045f02914af +Subproject f3d4cd402ecbdd45793884b5b46c287af0e4cb6 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject bc8fefc2470ccb2ecc2edaab9822f71be09fa90 +Subproject 6035467b37bc71b0ea25155fa70f85bee054d1a diff --git a/qtwebsockets b/qtwebsockets -Subproject f5ea17db7f103bb28f210d96c5b82b431579993 +Subproject 704174bcc9f445cdf9d471acfa380bec6feb357 diff --git a/qtwebview b/qtwebview -Subproject 4cefce7644f1eb9b9a5750ebc1b361976d86644 +Subproject 53cfa9f6da036418e2842ac22871cdcc09c90ae diff --git a/qtwinextras b/qtwinextras -Subproject 3751a970f02cbac9a63ae80273cacd62e690ad7 +Subproject dee746479a701828c01efc91b507ef279dc0f47 diff --git a/qtx11extras b/qtx11extras -Subproject c12cc26b7d64aef12f6f1ccedf3273f23799e92 +Subproject 39bd69edcc373465bc11077140993058c18ee4a diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 75e9858a87307f61b478735f73c0a60c52c25eb +Subproject 7ceeac41d44b81e1b76b13c473611ae5f25d8e8 |