summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-02-27 12:43:22 +0100
committerLiang Qi <liang.qi@qt.io>2019-02-27 12:43:22 +0100
commit2d0e6b81ddabbaa1dad257c47e40ee758af17b39 (patch)
tree1ed1ec9e62afb4001326c9126cd4d5472761c58f /coin/provisioning/qtci-windows-10-x86_64
parent4e99a6976cae711cb4d456d137088b2acb99f96f (diff)
parent1c6f272dd0a0a43af85428efbe6d640a7a9803f6 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: coin/provisioning/common/windows/android-openssl.ps1 Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps12
1 files changed, 2 insertions, 0 deletions
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"
+