summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-06-07 10:07:07 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-06-07 10:58:49 (GMT)
commit0ac21330b6cf5f95d733f16ff16614879000b588 (patch)
treed03717b789d5efa04fcfadd3e90cb3454aac107c
parent88bea4e52f6bd4570b0424a93b1d2e5ca96e6c11 (diff)
parentab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4 (diff)
downloadqtscript-0ac21330b6cf5f95d733f16ff16614879000b588.tar.gz
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf qtscript.pro Change-Id: I82c6b48ebb96a574f5cba6ffbca6e37b0bef8891
-rw-r--r--qtscript.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qtscript.pro b/qtscript.pro
index 1694578..96cfa4c 100644
--- a/qtscript.pro
+++ b/qtscript.pro
@@ -1,3 +1,3 @@
-requires(!winrt:!tvos:!watchos)
+requires(!integrity:!winrt:!tvos:!watchos)
load(qt_parts)