From 60985aa42b37217fb4c01ed85bbf6f14410c3491 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 5 Aug 2016 13:35:39 +0200
Subject: Use qtConfig throughout in qtbase

Use the new qtConfig macro in all pro/pri files.

This required adding some feature entries, and adding
{private,public}Feature to every referenced already existing entry.

Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri | 3 +--
 src/platformsupport/input/evdevmouse/evdevmouse.pri       | 3 +--
 src/platformsupport/input/evdevtablet/evdevtablet.pri     | 3 +--
 src/platformsupport/input/evdevtouch/evdevtouch.pri       | 5 ++---
 src/platformsupport/input/input.pri                       | 8 ++++----
 src/platformsupport/input/libinput/libinput.pri           | 5 ++---
 6 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'src/platformsupport/input')

diff --git a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri
index 19cc8b1c33..445f230fa5 100644
--- a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri
+++ b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri
@@ -7,6 +7,5 @@ SOURCES += \
     $$PWD/qevdevkeyboardhandler.cpp \
     $$PWD/qevdevkeyboardmanager.cpp
 
-contains(QT_CONFIG, libudev) {
+qtConfig(libudev): \
     QMAKE_USE_PRIVATE += libudev
-}
diff --git a/src/platformsupport/input/evdevmouse/evdevmouse.pri b/src/platformsupport/input/evdevmouse/evdevmouse.pri
index 103092b7d0..a8c9c663f3 100644
--- a/src/platformsupport/input/evdevmouse/evdevmouse.pri
+++ b/src/platformsupport/input/evdevmouse/evdevmouse.pri
@@ -6,7 +6,6 @@ SOURCES += \
     $$PWD/qevdevmousehandler.cpp \
     $$PWD/qevdevmousemanager.cpp
 
-contains(QT_CONFIG, libudev) {
+qtConfig(libudev): \
     QMAKE_USE_PRIVATE += libudev
-}
 
diff --git a/src/platformsupport/input/evdevtablet/evdevtablet.pri b/src/platformsupport/input/evdevtablet/evdevtablet.pri
index 2475f76a05..ea1712ad2f 100644
--- a/src/platformsupport/input/evdevtablet/evdevtablet.pri
+++ b/src/platformsupport/input/evdevtablet/evdevtablet.pri
@@ -6,6 +6,5 @@ SOURCES += \
     $$PWD/qevdevtablethandler.cpp \
     $$PWD/qevdevtabletmanager.cpp
 
-contains(QT_CONFIG, libudev) {
+qtConfig(libudev): \
     QMAKE_USE_PRIVATE += libudev
-}
diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri
index 1e9f697868..58fafcd8f9 100644
--- a/src/platformsupport/input/evdevtouch/evdevtouch.pri
+++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri
@@ -8,11 +8,10 @@ SOURCES += \
 
 INCLUDEPATH += $$PWD/../shared
 
-contains(QT_CONFIG, libudev) {
+qtConfig(libudev): \
     QMAKE_USE_PRIVATE += libudev
-}
 
-contains(QT_CONFIG, mtdev) {
+qtConfig(mtdev) {
     CONFIG += link_pkgconfig
     PKGCONFIG_PRIVATE += mtdev
 }
diff --git a/src/platformsupport/input/input.pri b/src/platformsupport/input/input.pri
index 5ce9e6844f..eb4d8a983d 100644
--- a/src/platformsupport/input/input.pri
+++ b/src/platformsupport/input/input.pri
@@ -1,18 +1,18 @@
-contains(QT_CONFIG, evdev) {
+qtConfig(evdev) {
     include($$PWD/evdevmouse/evdevmouse.pri)
     include($$PWD/evdevkeyboard/evdevkeyboard.pri)
     include($$PWD/evdevtouch/evdevtouch.pri)
     include($$PWD/evdevtablet/evdevtablet.pri)
 }
 
-contains(QT_CONFIG, tslib) {
+qtConfig(tslib) {
     include($$PWD/tslib/tslib.pri)
 }
 
-contains(QT_CONFIG, libinput) {
+qtConfig(libinput) {
     include($$PWD/libinput/libinput.pri)
 }
 
-contains(QT_CONFIG, evdev)|contains(QT_CONFIG, libinput) {
+qtConfig(evdev)|qtConfig(libinput) {
     include($$PWD/shared/shared.pri)
 }
diff --git a/src/platformsupport/input/libinput/libinput.pri b/src/platformsupport/input/libinput/libinput.pri
index d9f64c7449..f922769a37 100644
--- a/src/platformsupport/input/libinput/libinput.pri
+++ b/src/platformsupport/input/libinput/libinput.pri
@@ -14,8 +14,7 @@ QMAKE_USE_PRIVATE += libudev libinput
 
 INCLUDEPATH += $$PWD/../shared
 
-contains(QT_CONFIG, xkbcommon-evdev) {
+qtConfig(xkbcommon-evdev): \
     QMAKE_USE_PRIVATE += xkbcommon_evdev
-} else {
+else: \
     DEFINES += QT_NO_XKBCOMMON_EVDEV
-}
-- 
cgit v1.2.3