summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-02 01:00:50 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-02 01:00:50 +0200
commit0d409333d8679c75beeeda2711a9f01b5e708743 (patch)
tree0058d7d3e1f9874893aa367a4ee802940c16549d /tools
parent9b6c20cb719542cfcf3e031afd5b2b0b1cd3833e (diff)
parentad6061b265b6a482a6e0e29b20be0c681332abb1 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
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)