diff options
author | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
commit | 8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch) | |
tree | 0e60ea439dae4b823bc910fb85cef488754092e1 /coin/provisioning/qtci-windows-10-x86 | |
parent | 869c15629d8397bc725c61da423a4a038ef4d395 (diff) | |
parent | f31970d5ac48cd2ae6601aca32738ea718edb265 (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')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + |