aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-06-07 12:06:14 +0200
committerLiang Qi <liang.qi@qt.io>2017-06-07 12:06:15 +0200
commit55490690f81eba168b06a90e4a66cefc20b38252 (patch)
tree9c6b6b9234aa767af1c69cac4d4cf896f292be20 /tools
parent5624e82d068ebab254239121810fc097af7fcb40 (diff)
parentd8f84e5769632544dfac5138348481330c4da4cd (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlcachegen/qmlcache.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index 4470db0d09..330da358b7 100644
--- a/tools/qmlcachegen/qmlcache.prf
+++ b/tools/qmlcachegen/qmlcache.prf
@@ -3,6 +3,11 @@ static {
return()
}
+android {
+ message("QML cache generation ahead of time is not supported on Android")
+ return()
+}
+
qtPrepareTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK)
isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name) for ahead-of-time QML cache generation")