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

8 files changed, 101 insertions, 15 deletions

diff --git a/.gitmodules b/.gitmodules
index 4aa42ae3..97a74435 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,7 +68,7 @@
 	url = ../qtrepotools.git
 	branch = master
 	status = essential
-	qt = false
+	project = -
 [submodule "qtwebkit"]
 	depends = qtbase
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 48eec8dc..d31d2dd3 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,14 +1,14 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-6                                            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-5                                               MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-6                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-6            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-6            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
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index e73ec703..16fe6e14 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,8 +1,8 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-6    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86-5                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-6                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic 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-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
@@ -13,7 +13,7 @@ qtci-linux-RHEL-6.6-x86_64  QNX_660             armv7       GCC         Packagin
 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-6    QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-6    QNX_700             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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
index 46675c23..01442324 100644
--- 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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
index 46675c23..01442324 100644
--- 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
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc.ps1
new file mode 100644
index 00000000..1de57a66
--- /dev/null
+++ 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
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
new file mode 100644
index 00000000..1de57a66
--- /dev/null
+++ 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
diff --git a/qt.pro b/qt.pro
index 373b60c9..b4730fba 100644
--- 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()