summaryrefslogtreecommitdiffstats
path: root/src/plugins/generic/generic.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-08-26 21:19:12 +0200
committerLars Knoll <lars.knoll@qt.io>2016-09-15 08:24:10 +0000
commita668c6a6b605ce516f71b9339df53699e85ad248 (patch)
treec31efe90350cc21c37035f6b5016edfeafde7e82 /src/plugins/generic/generic.pro
parentb22471edf9ff666e87b12398460dfd6e761bc24c (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/generic/generic.pro')
-rw-r--r--src/plugins/generic/generic.pro6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
index 69e832906b..996e57d015 100644
--- a/src/plugins/generic/generic.pro
+++ b/src/plugins/generic/generic.pro
@@ -1,7 +1,5 @@
TEMPLATE = subdirs
-QT_FOR_CONFIG += gui-private
-
-load(qfeatures)
+QT_FOR_CONFIG += gui-private network-private
qtConfig(evdev) {
SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
@@ -11,7 +9,7 @@ qtConfig(tslib) {
SUBDIRS += tslib
}
-!contains(QT_DISABLED_FEATURES, udpsocket) {
+qtConfig(udpsocket) {
SUBDIRS += tuiotouch
}