aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules80
-rw-r--r--_clang-format8
-rwxr-xr-xcoin/provisioning/common/linux/emsdk.sh6
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh4
-rw-r--r--coin/provisioning/common/windows/helpers.ps119
-rw-r--r--coin/provisioning/common/windows/install-gnuwin32.ps146
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps131
-rw-r--r--coin/provisioning/common/windows/vc_redist.ps13
-rw-r--r--coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps12
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcanvas3d0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpurchasing0
m---------qtqa0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtremoteobjects0
m---------qtrepotools0
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
56 files changed, 147 insertions, 63 deletions
diff --git a/.gitmodules b/.gitmodules
index 8b797957..7657f30f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.12.2
+ branch = 5.12
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.12.2
+ branch = 5.12
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.12.2
+ branch = 5.12
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.12.2
+ branch = 5.12
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = 5.12.2
+ branch = 5.12
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.12.2
+ branch = 5.12
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = 5.12.2
+ branch = 5.12
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,185 +123,185 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.12.2
+ branch = 5.12
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.12.2
+ branch = 5.12
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = 5.12.2
+ branch = 5.12
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
- branch = 5.12.2
+ branch = 5.12
status = addon
diff --git a/_clang-format b/_clang-format
index ee000a1e..c64ae331 100644
--- a/_clang-format
+++ b/_clang-format
@@ -13,9 +13,10 @@ BasedOnStyle: WebKit
Standard: Cpp11
-# Leave the line breaks up to the user.
+# Column width is limited to 100 in accordance with Qt Coding Style.
+# https://wiki.qt.io/Qt_Coding_Style
# Note that this may be changed at some point in the future.
-ColumnLimit: 0
+ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
@@ -77,4 +78,5 @@ SortIncludes: false
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
-
+# Break constructor initializers before the colon and after the commas.
+BreakConstructorInitializers: BeforeColon
diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh
index 64753844..284eb19d 100755
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-version="1.38.1"
+version="1.38.16"
version_node="8.9.1"
urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
-sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
-sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
+sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
+sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
targetFolder="/opt/emsdk"
sudo mkdir "$targetFolder"
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index 4a7a6837..b40c1922 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,9 +38,9 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
-version="6.3.2"
+version="6.4.3"
# Branch version without dot
-qtBranch="510x"
+qtBranch="512x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index 76ad4867..f5318bcb 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -159,3 +159,22 @@ function IsProxyEnabled {
function Get-Proxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
}
+
+function Remove {
+
+ Param (
+ [string]$Path = $(BadParam("a path"))
+ )
+ Write-Host "Removing $Path"
+ $i = 0
+ While ( Test-Path($Path) ){
+ Try{
+ remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+ }catch{
+ $i +=1
+ if ($i -eq 5) {exit 1}
+ Write-Verbose "$Path locked, trying again in 5"
+ Start-Sleep -seconds 5
+ }
+ }
+}
diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1
new file mode 100644
index 00000000..99862b3c
--- /dev/null
+++ b/coin/provisioning/common/windows/install-gnuwin32.ps1
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 5fb032f5..de04d242 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,18 +38,18 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
-$version = "6.3.2"
+$version = "6.4.3"
# Qt branch without dot (*.*)
-$qtBranch = "510x"
-# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
+$qtBranch = "512x"
+# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
$testSuite = "suite_test_squish"
-$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
+$testSuiteUrl = "$squishUrl\$testSuite.7z"
# Squish license
$licensePackage = ".squish-3-license"
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
[string]$bit,
[string]$squishPackage
)
-
+ # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
+ if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
+ $qtBranch = "511x"
+ }
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
@@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl
if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 msvc14
+ DownloadAndInstallSquish $version win64 "msvc14"
+ DownloadAndInstallSquish $version win64 "msvc141"
+ DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+ } else {
+ DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
- DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
+ } else {
+ DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
- DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
}
diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1
index f68846f0..1cd81a37 100644
--- a/coin/provisioning/common/windows/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.ps1
@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable $package "/q"
-Write-Host "Remove $package..."
-Remove-Item -Force -Path $package
+Remove $package
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..331de489
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/qt3d b/qt3d
-Subproject 3de900a10c6fd051ba54727be2fd1fe47ed1048
+Subproject e9868e157b56eea991e34712eace5962d14543e
diff --git a/qtactiveqt b/qtactiveqt
-Subproject b918e20d4c9572bfc4148aba94ac53cf811b8cc
+Subproject 922903ba18bab04e81686ab9a7d8a908d9f83e4
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 860fd4b991a9f94f07aaf45cee36bab661f3dd2
+Subproject bc5e209ee2b7652684c8f4efd18b6506231dbf8
diff --git a/qtbase b/qtbase
-Subproject 856fb1ab44722f5165fb6b5dec0bd748006acd1
+Subproject b0145f029cdde7ae8475b85a20099f115879496
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject f9b7e894b3d91bf760d71d7d784e2d162da0569
+Subproject 9bd0368d77022012a0283d8e1635204e6556c3e
diff --git a/qtcharts b/qtcharts
-Subproject c9bc2672b513a414708026f4271d247feaa2647
+Subproject a3d050aeca7e9c0b169938b0d27b87d005500ad
diff --git a/qtconnectivity b/qtconnectivity
-Subproject eec8fed760a572eb9187f79b43d87986f2b4f40
+Subproject 16f033fb13a3005eefbe8b7b6ccc52bfda08649
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 428195cb2b1dc0c48eb348abb856cdaabf79dc0
+Subproject 111484f3e3c0ac79a7c672d66bf8bd54d711e5c
diff --git a/qtdeclarative b/qtdeclarative
-Subproject cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0
+Subproject 710580aa84c5c3273e883d9e650f3159ad8250f
diff --git a/qtdoc b/qtdoc
-Subproject ecc569fbcd1dc41cc08796a42752ff394826771
+Subproject b107451957d8c74eb70d660d8313b4bc0dcf200
diff --git a/qtgamepad b/qtgamepad
-Subproject 744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0
+Subproject 9f810a34af4ad80023800b96f73e344bae7ef5b
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 41ab3587cf0847e3442da6d14253e4bec4e8783
+Subproject 72f39883c7beb7ea9bd7ccb6ecf29212cfd43e0
diff --git a/qtimageformats b/qtimageformats
-Subproject 1b8478f86f15dc1dd125a2a0d8331bc3600a79c
+Subproject d83c22120c546dd9612d41b4acb02e489cd0d33
diff --git a/qtlocation b/qtlocation
-Subproject a00c5e40a2df03713d29da83a5692f2d7c15326
+Subproject 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bf
diff --git a/qtmacextras b/qtmacextras
-Subproject 4509e67e2206f9077645d5946faf7dc2f113215
+Subproject 80eae30a82bcecddc46479aa0ec08ca468bb8ea
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 9caf4812e073829fc961eb466f1325106f04184
+Subproject 935967a453b47ae7c8e9ad3d94eef3813eab58d
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject bd9c083ba099a46d101ca64369f46ba7fba2a94
+Subproject c03bd32dc38356b5de7f0507253c9ba901cee47
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 2234141c0ec838dd537bec909c87e8a184125f6
+Subproject 172df3e3c8822b3458207210b6180df22b2f3e6
diff --git a/qtqa b/qtqa
-Subproject 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4a
+Subproject dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject c231395eec3494619f4977b4c5cd845b9d7341a
+Subproject d601a02c236314a023d5cea53d17747df6a9d84
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject ca799283a2266b023923286b4928fdf6e721156
+Subproject 0ee25027edf1be38412e2a397c1c0a71d2bd146
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 1c19349a28a75eec386b84af142fc571e492a3c
+Subproject 9ac11de4f66ca666bbf00832c5a63691960302c
diff --git a/qtrepotools b/qtrepotools
-Subproject f9c6da38f70d9bf95937a5de8269e0f8d52600a
+Subproject a29ca6139902e0eba6bf5f6b46eb56d54fb59ea
diff --git a/qtscript b/qtscript
-Subproject 6c0edaf30c5bdfc2739ca646da73dcb697ab136
+Subproject 19a2577178e7dc63d7fd6981193484f3ac160ac
diff --git a/qtscxml b/qtscxml
-Subproject 4bb7aa3f3002b9ba85494e5cf4808f68e0edc50
+Subproject ef4b9753f5fce47977f498c7206c98f1de3f633
diff --git a/qtsensors b/qtsensors
-Subproject 73d5160ab8219015a25e59c62669b2926156b80
+Subproject d0e959844d60a547430cd7731d6645230656115
diff --git a/qtserialbus b/qtserialbus
-Subproject 745120ddca5fa67f1a87741e0a5c016acbd53de
+Subproject 82232b93711a0a747a82d1378f23a4c5db80746
diff --git a/qtserialport b/qtserialport
-Subproject 624f175492660301af5eb321d2b8d6af7aa7fbc
+Subproject 86c674377344871ff307972f249f6383b1ee9ca
diff --git a/qtspeech b/qtspeech
-Subproject f899a4c2051ca4256faba2d268ca032dd129f20
+Subproject 3f956ce7e7488ec88748a234ec0d8e1a8bd661c
diff --git a/qtsvg b/qtsvg
-Subproject 2430c9ed20f3f10da7bc3e7fdb5328d8501f577
+Subproject a042c6ea6cdf465eb47c26e11c1c929b5afe058
diff --git a/qttools b/qttools
-Subproject b0147a5d79ce7a7e77a24f36aaddfacb1a1517c
+Subproject c7dbb12a734b4203c3613ae3950b2e7729643d6
diff --git a/qttranslations b/qttranslations
-Subproject c8a0da51adcc015447fc26e5a2b3d1de12479f7
+Subproject 309333c0d01046af1e5e8ae3cbf607eb9e08108
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 277aad92fb5d5612c2b952f05063518d877a513
+Subproject a50ec39770c2e6c811bd65164b177f71d249f45
diff --git a/qtwayland b/qtwayland
-Subproject 0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bf
+Subproject 4cba9d595311ac6040bf93450d1fb09ec0a3d9f
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 45da510a0a87593a2ae6f98e41bb01b9d39ace5
+Subproject efccc2b6f12005b2d5397aef1e2822a2fc69933
diff --git a/qtwebengine b/qtwebengine
-Subproject 92b078a534390dba64a0dcebcffdab4ce24581b
+Subproject cbeef3ee920576d668664ca2e0b8a55ae307959
diff --git a/qtwebsockets b/qtwebsockets
-Subproject b4bac09b3b2f0c3072d797b22c44e20b661c472
+Subproject db90e6d410314c33aff7031f98d178cdafdda67
diff --git a/qtwebview b/qtwebview
-Subproject 0aa43dc555e0a820bf13a6b12671ee6a7916115
+Subproject ebb9acb99b640549742c579c73e11cbcd371497
diff --git a/qtwinextras b/qtwinextras
-Subproject 23dd4484915e3de89a093f8525afed1c5b8294e
+Subproject 45bae08122145a770601b3898d86532b9261b67
diff --git a/qtx11extras b/qtx11extras
-Subproject 3bfaa26890990d140caba4b9a1050906c2ee546
+Subproject ab83a6578cddfe9750e2df41a95c8692bdf13ed
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject e8026ec6a30c5124c2e3162d9a17e9ae11fa447
+Subproject df6fe14535fb25305321fd278926ad2b4de3e3b