diff options
| author | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-08-02 11:03:06 +0000 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-08-02 13:13:07 +0000 |
| commit | 0647df8c88d4eaeedd19456b6e382308208e2be1 (patch) | |
| tree | dea20bb66127cd7947276033cfbf13304009b388 /tools | |
| parent | dfc6dc1d94a729f701172861a196b4b34bcd7518 (diff) | |
Revert "Yield error if qtquickcompiler is used in non-QML projects"
This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because
it prevents enabling the qtquickcompiler feature globally.
Fixes: QTBUG-77277
Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tools')
| -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 967d55a5bd..b98d8a0198 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) |