diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 01:00:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 01:00:07 +0200 |
| commit | b94b547ad2608cf989f25841360b20082337a8dc (patch) | |
| tree | 1e494d82d215da9707716f5265479b53edb3ab17 /tools/qmlcachegen | |
| parent | 1c59558b03715c6be46650489547c5f9d60d3464 (diff) | |
| parent | 1535c36a4728b3355ebe8abba4a9966eb2169d27 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I9ce3eee3d6f88783b9e20110a2814bee805291a4
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) |