diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-01 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-01 01:00:45 +0200 |
| commit | ad6061b265b6a482a6e0e29b20be0c681332abb1 (patch) | |
| tree | e60addb897f41f527b0a7699386f02a28c0ce77d /tools/qmlcachegen | |
| parent | 6c26a1a137ff328ea144bccc5cb9ad52d71cf67d (diff) | |
| parent | ac0d313ab15aa78c444d00ed6a1a202a1351dfa1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic008bf9223a9ac293c925044355ff218f7ed7f78
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 2 |
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) |