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-10-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-10-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/60-jom.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/libusb.ps1) | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 index f92acd91..f92acd91 100644 --- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/04-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/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 index 167cfd35..167cfd35 100644 --- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 164fbe43..164fbe43 100644 --- a/coin/provisioning/qtci-windows-10-x86/python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-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..37af7119 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 diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 index 842c65dd..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 index 8dbe0372..8dbe0372 100644 --- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 index a853ffef..a853ffef 100644 --- a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 |