summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-01 01:00:45 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-01 01:00:45 +0200
commitad6061b265b6a482a6e0e29b20be0c681332abb1 (patch)
treee60addb897f41f527b0a7699386f02a28c0ce77d /tools
parent6c26a1a137ff328ea144bccc5cb9ad52d71cf67d (diff)
parentac0d313ab15aa78c444d00ed6a1a202a1351dfa1 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlcachegen/qtquickcompiler.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index 9c8c7a7b1e..2f98aadefe 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -1,4 +1,4 @@
-qtc_run: return()
+if(qtc_run|lupdate_run): return()
qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
qtPrepareTool(QMAKE_RCC, rcc, _DEP)