summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-12 12:51:53 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-12 21:13:56 +0100
commitc2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch)
tree35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
parentab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff)
parent19872ea84352182ee974ff84d2e3872a21427117 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1')
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps11
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
deleted file mode 100644
index ae3f327d..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"