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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/auto/corelib/plugin/plugin.pro | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/plugin/qfactoryloader/test/test.pro | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro index 777e920995..774edc655a 100644 --- a/tests/auto/corelib/plugin/plugin.pro +++ b/tests/auto/corelib/plugin/plugin.pro @@ -3,8 +3,7 @@ SUBDIRS=\ qfactoryloader \ quuid -load(qfeatures) -!contains(QT_DISABLED_FEATURES, library): SUBDIRS += \ +qtConfig(library): SUBDIRS += \ qpluginloader \ qplugin \ qlibrary diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro index f1e76c31bf..3345651730 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro +++ b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro @@ -19,7 +19,6 @@ win32 { mac: CONFIG -= app_bundle -load(qfeatures) -contains(QT_DISABLED_FEATURES, library) { +!qtConfig(library) { LIBS += -L ../bin/ -lplugin1 -lplugin2 } |