diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:08:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:08:20 +0100 |
| commit | 2a39f8e5fe113cf96b3b11848ead1bf4011f1966 (patch) | |
| tree | 49b1305970567c66026a0531300f195ee55eeacd /coin/provisioning/qtci-windows-7-x86 | |
| parent | d3c2de907d299481c942f96ab84c627761dbb446 (diff) | |
| parent | 89d4dec81886a5e2d1e7537195f8677146666c85 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/25-python3.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/12-icu.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/25-python.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 | 1 |
6 files changed, 0 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 index 164fbe43..164fbe43 100644 --- a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 index 41210dcb..41210dcb 100644 --- a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 index 1f26c731..1f26c731 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" |