diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-05 01:00:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-05 01:00:04 +0200 |
| commit | 6af8e21bb0555623647631ed9be1982335b77534 (patch) | |
| tree | 562427d956f4aac33a8555ae4526b85cd59ef473 /tools/qmlcachegen | |
| parent | 47b2cde5dcca49a1969a43b294931323eff68f74 (diff) | |
| parent | 9a53834f1e7fce2fc3b1ecc2a311faedbc371d37 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I47735445e4d31ba47d596d964b3f050e263bd1d9
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 2f98aadefe..24cbe7f2e5 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -1,5 +1,15 @@ 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) |