Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca

17 files changed, 6 insertions, 54 deletions

diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2
index 6dbb032f..a4244777 100644
--- a/LICENSE.GPLv2
+++ b/LICENSE.GPLv2
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU General Public License version 2, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b122..71c4ad49 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e184611..dfcab5e2 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac0..6bf924cd 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/coin/README b/coin/README
index 891d7202..2fb3fe2d 100644
--- a/coin/README
+++ b/coin/README
@@ -6,4 +6,6 @@ This directory contains files used by Qt's Continuous Integration system (Coin).
 provisioning
 ------------
 Contains scripts that apply to different test machines in order to run automatic tests on them.
+For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set.
+(Run as admin in PowerShell)
 
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
index 7756bd0f..325be36a 100644
--- a/coin/provisioning/qtci-windows-10-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\icu.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1
index 360fad95..842c65dd 100644
--- a/coin/provisioning/qtci-windows-10-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
index 7756bd0f..325be36a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\icu.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
index 360fad95..842c65dd 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1
index 7756bd0f..325be36a 100644
--- a/coin/provisioning/qtci-windows-7-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\icu.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1
index 360fad95..842c65dd 100644
--- a/coin/provisioning/qtci-windows-7-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1
index 7756bd0f..325be36a 100644
--- a/coin/provisioning/qtci-windows-8-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\icu.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1
index 360fad95..842c65dd 100644
--- a/coin/provisioning/qtci-windows-8-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
index 7756bd0f..325be36a 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\icu.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
index 360fad95..842c65dd 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
-
-Set-ExecutionPolicy Restricted -Force
diff --git a/qtqa b/qtqa
-Subproject 32893be6fa2c1068df16479979acf9b3ba7f6bc
+Subproject aed1d474537fb5b9ea145729604277b2472e006
diff --git a/qtrepotools b/qtrepotools
-Subproject be3d47ae9560950de0908f0129703e9f7a8d68c
+Subproject d856dc5d249e75d6dac3c9a02373467ead12037