diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-05 13:47:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-05 13:47:15 +0200 |
| commit | 28ce9711b23cd526c6f5627f750fed840bed2d32 (patch) | |
| tree | 957378bd2c8a07d60147b963fcf580920fb1581e /tools/qmlcachegen | |
| parent | aeec2f94c376c9a0e84bbbb3be4652384c7da113 (diff) | |
| parent | 0647df8c88d4eaeedd19456b6e382308208e2be1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I042df89ddd381c7fbb944b7ff49d5b45b764fd47
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 24cbe7f2e5..2f98aadefe 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -1,15 +1,5 @@ if(qtc_run|lupdate_run): return() -!contains(QT, qml) { - qt_modules = \ - $$replace(QT, -private$, _private) \ - $$replace(QT_PRIVATE, -private$, _private) - qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends") - !contains(qt_modules, qml): \ - error("The qtquickcompiler feature cannot be used without the QML module.") - unset(qt_modules) -} - qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) qtPrepareTool(QMAKE_RCC, rcc, _DEP) |