summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-03-14 12:34:55 +0100
committerLiang Qi <liang.qi@qt.io>2019-03-14 12:36:04 +0100
commite6e5e7b2ee668a9e8dec78a6f2c392b338fbaf5c (patch)
treed8927e23704c8f530ca640be7037e0e1f08d1879 /coin/provisioning/qtci-windows-10-x86_64
parented3d7f6cf5c15cf595a3d6b195d03f572085840d (diff)
parent05455843158054656296f89051f594a5a5bfdbc0 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: .gitmodules coin/provisioning/common/macos/docker_testserver.sh Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps12
3 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
index e7f4c248..e7f4c248 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
index 57428310..57428310 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1
new file mode 100644
index 00000000..8bcdf3fa
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"
+