Update submodules on '5.9.0' in qt5

Change-Id: I4e4d240d00a9696f264d2e4f5fb1e76e2545710c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2026-01-19 13:25:59 +08:00 · 2017-05-27 05:06:31 +00:00 · 2017-05-22 20:36:56 +00:00 · 2017-05-20 19:22:51 +00:00 · 2017-05-19 15:31:00 +00:00 · 2017-05-19 03:48:11 +00:00
64 changed files with 500 additions and 230 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9
+	branch = 5.9.0
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,13 +68,13 @@
 	url = ../qtrepotools.git
 	branch = master
 	status = essential
-	qt = false
+	project = -
 [submodule "qtwebkit"]
 	depends = qtbase
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.9
+	branch = 5.9.0
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.9
+	branch = 5.9.0
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -96,14 +96,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -136,27 +136,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qt3d"]
-	depends = qtdeclarative qtimageformats
-	recommends = qtgamepad
+	depends = qtdeclarative
+	recommends = qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -169,51 +169,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9
+	branch = 5.9.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -226,14 +226,14 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
@@ -241,86 +241,86 @@
 	serialize = qtwebkit
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9
+	branch = 5.9.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
-	url = ../qtgamepad
-	branch = 5.9
+	url = ../qtgamepad.git
+	branch = 5.9.0
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
-	url = ../qtscxml
-	branch = 5.9
+	url = ../qtscxml.git
+	branch = 5.9.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
-	url = ../qtspeech
-	branch = 5.9
+	url = ../qtspeech.git
+	branch = 5.9.0
 	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
-	url = ../qtnetworkauth
-	branch = 5.9
+	url = ../qtnetworkauth.git
+	branch = 5.9.0
 	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	path = qtremoteobjects
-	url = ../qtremoteobjects
-	branch = 5.9
+	url = ../qtremoteobjects.git
+	branch = 5.9.0
 	status = preview
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,26 +1,25 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-5                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
 qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-7-x86-2                                                Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-4                                               MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-5            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86-6                                               MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
 qtci-linux-Ubuntu-16.04-x86_64                                      GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
 qtci-linux-openSUSE-42.1-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
 qtci-macos-10.12-x86_64-8                                           Clang       DebugAndRelease Release DisableTests
-qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch DisableTests
+qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64                                               Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework
 qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64      Boot2Qt_Jethro      x86_64      GCC         DisableTests
-qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64                                      GCC         TestOnly LicenseCheck
+qtci-linux-RHEL-7.2-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,13 +1,22 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-5    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-7    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release DisableTests
 qtci-linux-RHEL-7.2-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-2        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-2        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-linux-RHEL-6.6-x86_64  QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-2        QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-2        QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-7    QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-7    QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-linux-RHEL-7.2-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -0,0 +1,48 @@
+############################################################################
+##
+## 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.
+##
+## $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\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"

 Download $url_cache $url_cache $msvcPackage
 Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
 echo "Cleaning $msvcPackage.."
 Remove-Item -Recurse -Force "$msvcPackage"
 echo "Visual Studio = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -0,0 +1,48 @@
+############################################################################
+##
+## 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.
+##
+## $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\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"

 Download $url_cache $url_cache $msvcPackage
 Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
 echo "Cleaning $msvcPackage.."
 Remove-Item -Recurse -Force "$msvcPackage"
 echo "Visual Studio = $version" >> ~\versions.txt
--- a/coin/provisioning/common/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/common/3dstudio_3rdparty.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
+
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
+Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
+Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
+Remove-Item $zip
+
+[Environment]::SetEnvironmentVariable("QT3DSTUDIO_3RDPARTY_DIR", "C:/Utils/Qt3DStudio3rdparty", "Machine")
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
@@ -0,0 +1,64 @@
+#!/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.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs QNX 7.
+
+set -e
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz"
+sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
+folderName="qnx700"
+targetFile="qnx700.tar.xz"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times"
+echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+if [ ! -d "$targetFolder" ]; then
+  mkdir -p $targetFolder
+fi
+if [ -d "$targetFolder/$folderName" ]; then
+  rm -rf $targetFolder/$folderName
+fi
+sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile"
+sudo chown -R qt:users "$targetFolder"/"$folderName"
+
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
+
+rm -rf $targetFile
+# Set env variables
+echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc
+echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
@@ -44,7 +44,6 @@ ExceptionGsettings1=100
 ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
-ExceptionDISPLAY=104

 try
 (
@@ -57,8 +56,6 @@ try

    echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
    echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
-    echo "Set DISPLAY"
-    echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY
 )
 catch || {
    case $ex_code in
@@ -78,10 +75,6 @@ catch || {
            echo "Failed to set network teset server address into /etc/hosts."
            exit 1;
        ;;
-        $ExceptionDISPLAY)
-            echo "Failed to set DISPLAY into ~/.bashrc."
-            exit 1;
-        ;;
    esac
 }

--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
@@ -64,3 +64,15 @@ sudo update-binfmts --package qemu-arm --install arm \
 # doesn't help since host version creates cache for a wrong architecture and running
 # armv7 fc-cache segfaults on QEMU.
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk
+
+# If normal fontconfig paths are used, qemu parses what ever files it finds from
+# the toolchain sysroot and the rest from the system fonts. Fix by copying the
+# system font configurations to a location which prefix that can't be found from
+# the toolchain sysroot. Links must also be dereferenced or their targets remain
+# pointing to the toolchain sysroot.
+QEMU_FONTCONFPATH=~/qemu_fonts
+QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf
+mkdir -p $QEMU_FONTCONFPATH
+cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH
+sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE
+echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile
--- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
@@ -46,6 +46,7 @@ ExceptionSetInitialDelay=101
 ExceptionSetDelay=102
 ExceptionVNC=103
 ExceptionNTS=104
+ExceptionDisableScreensaverPassword=105

 try
 (
@@ -78,6 +79,8 @@ try
 EOT
    ) || throw $ExceptionDisableScreensaver

+    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+
    echo "Set keyboard type rates and delays"
    # normal minimum is 15 (225 ms)
    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
@@ -113,5 +116,9 @@ catch || {
            echo "Failed to set NTS."
            exit 1;
        ;;
+        $ExceptionDisableScreensaverPassword)
+            echo "Failed to disable requiring of password after screensaver is enabled."
+            exit 1;
+        ;;
    esac
 }
--- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Enables the usage of temporary keychains for SSL autotests
+echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
@@ -79,7 +79,8 @@ try
    echo Installing JDK
    (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall

-    hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage
+    disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'`
+    hdiutil detach $disk || throw $ExceptionDetachImage

    echo "Removing temporary file '$targetFile'"
    rm "$targetFile" || throw $ExceptionRemoveTmpFile
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
@@ -39,14 +39,11 @@

 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-# shellcheck source=../common/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"

 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"

-baseUrl="http://ci-files01-hki.ci.local/input/android"
-baseAltUrl="https://dl.google.com/android/repository/"
+basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android"

 toolsVersion="r25.2.5"
 toolsFile="tools_$toolsVersion-macosx.zip"
@@ -58,13 +55,10 @@ sdkApiLevel="android-21"
 toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
 ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"

-toolsDlUrl="$baseUrl/$toolsFile"
-ndkDlUrl="$baseUrl/$ndkFile"
-toolsAltDlUrl="$baseAltUrl/$toolsFile"
-ndkAltDlUrl="$baseAltUrl/$ndkFile"
-
 toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"
 ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"

 ExceptionUnzipTools=100
 ExceptionUnzipNdk=101
@@ -74,16 +68,10 @@ ExceptionSdkManager=104

 try
 (
-    DownloadURL "$toolsDlUrl" "$toolsAltDlUrl" "$toolsSha1" "$toolsTargetFile"
-    DownloadURL "$ndkDlUrl" "$ndkAltDlUrl" "$ndkSha1" "$ndkTargetFile"
    echo "Unzipping Android NDK to '$targetFolder'"
-    sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
+    sudo unzip -q "$ndkSourceFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
    echo "Unzipping Android Tools to '$sdkTargetFolder'"
-    sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
-
-    echo "Removing temporary files."
-    rm "$toolsTargetFile" || throw $ExceptionRmTools
-    rm "$ndkTargetFile" || throw $ExceptionRmNdk
+    sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools

    echo "Changing ownership of Android files."
    sudo chown -R qt:wheel "$targetFolder"
--- a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## Copyright (C) 2016 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$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and - build-tools
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-
-set -e
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.ci.local/input/android"
-
-# SDK
-sdkVersion="android-sdk_r24.4.1-macosx.zip"
-sdkBuildToolsVersion="24.0.2"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkVersion"
-sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd"
-sdkTargetFile="$targetFolder/$sdkVersion"
-sdkExtract="unzip $sdkTargetFile -d $targetFolder"
-sdkFolderName="android-sdk-macosx"
-sdkName="sdk"
-
-# NDK
-ndkVersion="android-ndk-r10e-darwin-x86_64.zip"
-ndkUrl="$baseUrl/$ndkVersion"
-ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
-ndkTargetFile="$targetFolder/$ndkVersion"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-r10e"
-ndkName="ndk"
-
-function InstallAndroidPackage {
-    targetFolder=$1
-    version=$2
-    url=$3
-    sha1=$4
-    targetFile=$5
-    extract=$6
-    folderName=$7
-    name=$8
-
-    sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times"
-    shasum $targetFile |grep $sha1 || echo "shasum check failed !"
-    sudo chmod 755 $targetFile
-    sudo $extract || echo "Failed to extract $url"
-    sudo chown -R qt:wheel $targetFolder/$folderName
-    sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
-    sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version"
-}
-
-sudo mkdir $targetFolder
-# Install Android SDK
-echo "Installing Android SDK version $sdkVersion..."
-InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkVersion..."
-InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
-
-# For Qt 5.6, we by default require API levels 10, 11, 16 and 21, but we can override this by setting ANDROID_API_VERSION=android-21
-# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
-echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
--- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
@@ -46,6 +46,7 @@ ExceptionSetInitialDelay=101
 ExceptionSetDelay=102
 ExceptionVNC=103
 ExceptionNTS=104
+ExceptionDisableScreensaverPassword=105

 try
 (
@@ -78,6 +79,8 @@ try
 EOT
    ) || throw $ExceptionDisableScreensaver

+    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+
    echo "Set keyboard type rates and delays"
    # normal minimum is 15 (225 ms)
    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
@@ -113,6 +116,10 @@ catch || {
            echo "Failed to set NTS."
            exit 1;
        ;;
+        $ExceptionDisableScreensaverPassword)
+            echo "Failed to disable requiring of password after screensaver is enabled."
+            exit 1;
+        ;;
    esac
 }

--- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Enables the usage of temporary keychains for SSL autotests
+echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
--- a/coin/provisioning/qtci-windows-10-x86/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/msvc.ps1
@@ -0,0 +1,43 @@
+#############################################################################
+##
+## 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.
+##
+## $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$
+##
+#############################################################################
+
+# Visual Studios are pre-provisioned to tier1 images
+
+# MSVC 2015 Update 3
+echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+
+# MSVC 2017
+echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+
+# MSVC 2017 Build Tools
+echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
--- a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
@@ -0,0 +1,48 @@
+#############################################################################
+##
+## 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.
+##
+## $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\..\common\helpers.ps1"
+
+# This script installs MinGW 5.3
+
+
+$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z"
+
+Invoke-WebRequest -UseBasicParsing  http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip
+Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a"
+Extract-7Zip $zip C:\
+Rename-Item -path C:\mingw32 -newName C:\MinGW530
+
+[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine")
+echo "MinGW = 5.3.0" >> ~/versions.txt
+del $zip
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## 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.
+##
+## $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\..\common\helpers.ps1"
+
+# This script installs QNX SDP 7.0
+
+$zip = "c:\users\qt\downloads\qnx700.7z"
+
+Invoke-WebRequest -UseBasicParsing  http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip
+Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
+Extract-7Zip $zip C:\
+
+[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine")
+echo "QNX SDP = 7.0.0" >> ~/versions.txt
+del $zip
--- a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
@@ -0,0 +1,43 @@
+#############################################################################
+##
+## 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.
+##
+## $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$
+##
+#############################################################################
+
+# Visual Studios are pre-provisioned to tier1 images
+
+# MSVC 2015 Update 3
+echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+
+# MSVC 2017
+echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+
+# MSVC 2017 Build Tools
+echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
--- a/2
+++ b/2
@@ -469,7 +469,7 @@ sub git_stat_one_submodule
    my $orig_cwd = getcwd();
    chdir($submodule) or confess "chdir $submodule: $OS_ERROR";

-    my @sts = qx(git status --porcelain --untracked=no);
+    my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all);

    # After a git clone --no-checkout, git status reports all files as
    # staged for deletion, but we still want to update the submodule.
--- a/qt.pro
+++ b/qt.pro
@@ -46,7 +46,8 @@ for (ever) {
 modules = $$sort_depends(modules, module., .depends .recommends .serialize)
 modules = $$reverse(modules)
 for (mod, modules) {
-    equals(module.$${mod}.qt, false): \
+    project = $$eval(module.$${mod}.project)
+    equals(project, -): \
        next()

    deps = $$eval(module.$${mod}.depends)
@@ -60,7 +61,6 @@ for (mod, modules) {
    !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \
        next()

-    project = $$eval(module.$${mod}.project)
    isEmpty(project) {
        !exists($$mod/$${mod}.pro): \
            next()
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	5bb74ad51f	Update submodules on '5.9.0' in qt5 Change-Id: I4e4d240d00a9696f264d2e4f5fb1e76e2545710c Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2017-05-27 05:06:31 +00:00
Qt Submodule Update Bot	4d6b04db3c	Update submodules on '5.9.0' in qt5 Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-22 20:36:56 +00:00
Qt Submodule Update Bot	d2430f9e6f	Update submodules on '5.9.0' in qt5 Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-05-20 19:22:51 +00:00
Liang Qi	90e14cf194	Update qtlocation manually Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-05-19 15:31:00 +00:00
Qt Submodule Update Bot	9b9b3817b1	Update submodules on '5.9.0' in qt5 Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-05-19 03:48:11 +00:00
Heikki Halmet	d514585213	Enable WinRT builds for MSVC 2017 All 2017 configurations are added to qt5.txt for now. Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-05-11 12:16:23 +00:00
Liang Qi	41379a50c7	Merge remote-tracking branch 'origin/5.6' into 5.9.0 Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8	2017-05-08 08:35:30 +02:00
Qt Submodule Update Bot	f5754fd722	Update submodules on '5.9.0' in qt5 Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-05-07 18:36:31 +00:00
Qt Submodule Update Bot	73a9754842	Update submodules on '5.9.0' in qt5 Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-05-06 17:32:39 +00:00
Oswald Buddenhagen	8d2f6c17f9	Merge remote-tracking branch 'origin/5.9' into 5.9.0 Conflicts: .gitmodules Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928	2017-05-05 11:22:54 +02:00
Tony Sarajärvi	4f4de8aa16	Change OS X 10.11 to run tests instead of 10.10 This commit removes OS X 10.10 as a developer build target, and enables autotests on osx 10.11 developer build. Task-number: QTQAINFRA-1090 Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-05 04:34:47 +00:00
Tony Sarajärvi	7937eb2d9e	Provisioning: disable screensaver password Previously provisioning disabled screensaver on startup but didn't affect current session. Thus the screensaver hits the VMs while provisioning and without this commit the screen gets locked. This prevents the lock and we get to the desktop on the VMs. Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-04 17:37:00 +00:00
Tasuku Suzuki	933688fc39	Change qt3d dependency on qtimageformats to optional only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>	2017-05-04 17:36:51 +00:00
Qt Submodule Update Bot	c1dd36f4d1	Update submodules on '5.9' in qt5 qttools manually updated to include compile fix. Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-04 17:36:44 +00:00
Heikki Halmet	a4a7f71f37	MSVC 2017 updated and missing component for winrt arm MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-03 09:51:17 +00:00
Oswald Buddenhagen	40b07da194	make sure that all submodule urls end in .git http(s) needs that. Started-by: Alvaro Denis <denisacostaq@gmail.com> Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>	2017-05-02 17:16:25 +00:00
Simon Hausmann	4ee0e8fb46	Fix tier1 template selection for QNX 7 builds on Windows Use the latest windows 10 template, not something outdated. Amends `e3e30b4a2b` with the tier1 update from commit `070d9333a6`. Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-05-02 17:16:22 +00:00
Heikki Halmet	385ecebe80	Platform Configurations for Visual Studio 2017 MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build tools. When winrt arm is available for msvc 2017 in qtbase it will be added to platform configurations also Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-05-02 17:16:19 +00:00
Qt Submodule Update Bot	5af86c74b2	Update submodules on '5.9' in qt5 Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-05-02 05:09:20 +00:00
Simo Fält	e3e30b4a2b	Provision toolchains and take QNX 7 SDP into use with 64 bit Win10 Task-number: QTQAINFRA-1113 Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-30 06:47:27 +00:00
Qt Submodule Update Bot	ed7ceee87d	Update submodules on '5.9' in qt5 Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-29 19:47:21 +00:00
Qt Submodule Update Bot	f436db11bb	Update submodules on '5.9' in qt5 Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-04-28 11:48:42 +00:00
Oswald Buddenhagen	8325f2bde9	Adjust submodule branches Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951	2017-04-27 12:34:03 +02:00
Simo Fält	e0764f873b	Provision and take QNX 7 SDP into use with RHEL 7.2 After enabling QNX 7, we are moving some QNX 6.6 config to be ran with qt5 integration only. Task-number: QTQAINFRA-1111 Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-04-27 10:25:59 +00:00
Sami Nurmenniemi	94e22fcd94	Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning If normal fontconfig paths are used, qemu parses what ever files it finds from the toolchain sysroot and the rest from the system fonts. Fix by copying the system font configurations to a location which prefix that can't be found from the toolchain sysroot. Links must also be dereferenced or their targets remain pointing to the toolchain sysroot. Task-number: QTBUG-59966 Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-04-27 10:25:56 +00:00
Tony Sarajärvi	ed39e440a9	Provision environment variables for SSL autotests Task-number: QTBUG-56102 Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>	2017-04-27 10:25:52 +00:00
Tony Sarajärvi	fb67cd8ef0	Provision: Remove excess export that wasn't read in Ubuntus Default shell for 'qt' user is Dash. It doesn't read .bashrc at all. Coin uses bash, but uses it non-interactively which in .bashrc means that it bails out immediately. So same result, .bashrc isn't read in Ubuntus. Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-27 10:25:49 +00:00
Miikka Heikkinen	c3d2bd97bf	Add provisioning for qt3dstudio 3rdparty tools Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-27 10:25:47 +00:00
Oswald Buddenhagen	2715a17c9b	get rid of custom 'qt' gitmodules property instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>	2017-04-27 04:17:42 +00:00
Qt Submodule Update Bot	c33f28bc05	Update submodules on '5.6' in qt5 Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-04-27 04:17:39 +00:00
Simon Hausmann	070d9333a6	Merge remote-tracking branch 'origin/5.6' into 5.9 Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-osx-10.10-x86_64/android.sh coin/provisioning/qtci-osx-10.11-x86_64/android.sh Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d	2017-04-25 12:37:26 +02:00
Simon Hausmann	9884a4e98e	Make Java installation independent from the disks in the system Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks when another disk is present in the system and the DMG ends up at disk2 for example. Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-04-25 04:56:11 +00:00
Simon Hausmann	2ea45a59a7	Improve Android SDK/NDK installation on macOS * Remove unused installation on macOS 10.10 as we only build packages on 10.11. * Replace the use of the ~1GB downloads of the zip files with a direct extraction via NFS. This is more resilient to flakyness in the network connection. Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-04-24 19:19:00 +00:00
Heikki Halmet	370fdfcefd	Provisioning: MSVC 2017 Build Tools MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-24 05:17:04 +00:00
Oswald Buddenhagen	3ea073ada1	ignore submodules in dirtiness check changed submodule sha1s should not prevent updating. Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>	2017-04-23 11:19:48 +00:00
Qt Submodule Update Bot	c6189f9723	Update submodules on '5.6' in qt5 Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-04-23 11:19:46 +00:00
Qt Submodule Update Bot	c253d71a06	Update submodules on '5.6' in qt5 Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-04-14 10:39:21 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"`