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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/network/network.pro | 3 | ||||
| -rw-r--r-- | examples/widgets/tools/tools.pro | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/network/network.pro b/examples/network/network.pro index 759f730af3..5ad5f1939f 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -19,8 +19,7 @@ qtHaveModule(widgets) { multicastreceiver \ multicastsender - load(qfeatures) - !contains(QT_DISABLED_FEATURES, bearermanagement) { + qtConfig(bearermanagement) { # no QProcess !vxworks:!qnx:!winrt:!integrity:!uikit: SUBDIRS += network-chat diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index f3cbd73d98..dd8401567b 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -16,8 +16,7 @@ SUBDIRS = \ contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n -load(qfeatures) -contains(QT_DISABLED_FEATURES, library) { +!qtConfig(library) { SUBDIRS -= \ echoplugin \ plugandpaint |