diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qfeatures.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/mkspecs/features/qfeatures.prf b/mkspecs/features/qfeatures.prf deleted file mode 100644 index 15ef5c5be0..0000000000 --- a/mkspecs/features/qfeatures.prf +++ /dev/null @@ -1,4 +0,0 @@ -# This file needs to be loaded explicitly, as the evaluation is relatively -# expensive, and not many projects will actually need it. -QMAKE_QT_FEATURES = $$[QT_HOST_DATA/get]/mkspecs/qfeatures.pri -include($$QMAKE_QT_FEATURES) | error("Failed to load $$QMAKE_QT_FEATURES") diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index af8a0e259d..e34d7ad194 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -285,8 +285,20 @@ defineTest(qtConfParseCommandLine) { } # handle builtin [-no]-feature-xxx isEmpty(type):contains(opt, "feature-(.*)") { - # simply skip for now - next() + opt ~= s,^feature-,, + found = false + for (cc, allConfigs) { + contains($${cc}.features._KEYS_, $$opt) { + found = true + break() + } + } + !$$found { + qtConfAddError("Enabling/Disabling unknown feature '$$opt'.") + return() + } + # this is a boolean enabling/disabling the corresponding feature + type = boolean } isEmpty(type) { |