diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-01 11:40:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-03 12:06:27 +0000 |
| commit | 285ee106e7748a08ab1271b140cfe0429587e2a6 (patch) | |
| tree | bac0ab40f6e38462eaf4337b724ba2f32cba89c4 /coin/provisioning/qtci-windows-8-x86 | |
| parent | 95223c7466afb4791f630cd76c6574f13e7506b3 (diff) | |
| parent | e00cb3ac596db7200108174cd85c66f4e3c1107a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/02-python.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/06-python.ps1 | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8-x86/02-python.ps1 deleted file mode 100644 index 0e401c02..00000000 --- a/coin/provisioning/qtci-windows-8-x86/02-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\02-python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 new file mode 100644 index 00000000..27c618e1 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 32 |