diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-04 12:05:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-04 12:55:57 +0200 |
commit | 44cf8f65a216d1f83f15b1254a487b5381b8d3e3 (patch) | |
tree | a7c42a2acd0d4e4d38e49200d51f17258d4cd126 /coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 | |
parent | f9635567942071206f10430024895db6a127abf8 (diff) | |
parent | 4f903d013962c516cceea5b91c4031a124e31c4f (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
Change-Id: I6adccbdcd3a4b794380a2e202e567146e663c15f
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" |