summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-13 11:38:39 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-13 11:38:39 +0200
commit8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch)
tree0e60ea439dae4b823bc910fb85cef488754092e1 /coin/provisioning/qtci-windows-10-x86_64
parent869c15629d8397bc725c61da423a4a038ef4d395 (diff)
parentf31970d5ac48cd2ae6601aca32738ea718edb265 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: coin/platform_configs/qt3d-runtime.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps12
2 files changed, 13 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
new file mode 100644
index 00000000..5401b36a
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install MinGW 7.3.0
+
+$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
+$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
+$suffix = "_i686"
+
+InstallMinGW $release $sha1 $suffix
+
+
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"
+