diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-26 21:19:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-09-15 08:24:10 +0000 |
| commit | a668c6a6b605ce516f71b9339df53699e85ad248 (patch) | |
| tree | c31efe90350cc21c37035f6b5016edfeafde7e82 /configure.pri | |
| parent | b22471edf9ff666e87b12398460dfd6e761bc24c (diff) | |
Convert the old feature system
... to the new qmake based configuration system.
This removes the old qfeatures.txt (distributed over configure.json
files) and qfeatures.h (distributed over qconfig-<module>.h files).
qfeatures.prf is gone without replacement, as attempts to use it would
lead to followup errors anyway.
Change-Id: I1598de19db937082283a905b9592d3849d2199d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/configure.pri b/configure.pri index e20ccd8bf4..7ec845375e 100644 --- a/configure.pri +++ b/configure.pri @@ -379,43 +379,6 @@ defineTest(qtConfOutput_compilerVersion) { export($${currentConfig}.output.publicPro) } -# should go away when qfeatures.txt is ported -defineTest(qtConfOutput_extraFeatures) { - isEmpty(config.input.extra_features): return() - - # write to qconfig.pri - $${currentConfig}.output.publicPro += "$${LITERAL_HASH}ifndef QT_BOOTSTRAPPED" - for (f, config.input.extra_features) { - feature = $$replace(f, "^no-", "") - FEATURE = $$upper($$replace(feature, -, _)) - contains(f, "^no-.*") { - $${currentConfig}.output.publicPro += \ - "$${LITERAL_HASH}ifndef QT_NO_$$FEATURE" \ - "$${LITERAL_HASH}define QT_NO_$$FEATURE" \ - "$${LITERAL_HASH}endif" - } else { - $${currentConfig}.output.publicPro += \ - "$${LITERAL_HASH}if defined(QT_$$FEATURE) && defined(QT_NO_$$FEATURE)" \ - "$${LITERAL_HASH}undef QT_$$FEATURE" \ - "$${LITERAL_HASH}elif !defined(QT_$$FEATURE) && !defined(QT_NO_$$FEATURE)" \ - "$${LITERAL_HASH}define QT_$$FEATURE" \ - "$${LITERAL_HASH}endif" - } - } - $${currentConfig}.output.publicPro += "$${LITERAL_HASH}endif" - export($${currentConfig}.output.publicPro) - - # write to qmodule.pri - disabled_features = - for (f, config.input.extra_features) { - feature = $$replace(f, "^no-", "") - FEATURE = $$upper($$replace(feature, -, _)) - contains(f, "^no-.*"): disabled_features += $$FEATURE - } - !isEmpty(disabled_features): qtConfOutputVar(assign, "privatePro", QT_NO_DEFINES, $$disabled_features) -} - - defineTest(qtConfOutput_compilerFlags) { # this output also exports the variables locally, so that subsequent compiler tests can use them |