Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10

29 files changed, 18 insertions, 18 deletions

diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
index 27c618e1..19e64a94 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
index 2fc36311..75c6a232 100644
--- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\03-conan.ps1"
 
 Run-Conan-Install `
     -ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1
index 1de57a66..1de57a66 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
index cc8be923..3ad5b9fd 100644
--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 32
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
new file mode 100644
index 00000000..28299307
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
new file mode 100644
index 00000000..875b426f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
index 38185051..54a3d563 100644
--- a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vulkansdk.ps1"
+. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1
index 37af7119..fe1aec7d 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1
@@ -30,5 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
 
diff --git a/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1
new file mode 100644
index 00000000..078f862e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
new file mode 100644
index 00000000..b246ce25
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
new file mode 100644
index 00000000..73dc7bc2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
new file mode 100644
index 00000000..29a1cfa4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-10-x86/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-10-x86/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-10-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1
deleted file mode 100644
index 164fbe43..00000000
--- a/coin/provisioning/qtci-windows-10-x86/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1
deleted file mode 100644
index 4de520b2..00000000
--- a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\winrtrunner.ps1"