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 /src/plugins/plugins.pro | |
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 'src/plugins/plugins.pro')
-rw-r--r-- | src/plugins/plugins.pro | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0f4207c636..941c25361f 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,14 +1,13 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += network -load(qfeatures) SUBDIRS *= sqldrivers -qtHaveModule(network):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS += bearer +qtHaveModule(network):qtConfig(bearermanagement): SUBDIRS += bearer qtHaveModule(gui) { SUBDIRS *= platforms platforminputcontexts platformthemes - !contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats - !android:!contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic + qtConfig(imageformatplugin): SUBDIRS *= imageformats + !android:qtConfig(library): SUBDIRS *= generic } -!winrt:!wince*:qtHaveModule(widgets):!contains(QT_DISABLED_FEATURES, printer) { +!winrt:!wince:qtHaveModule(printsupport): \ SUBDIRS += printsupport -} |