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>

6 files changed, 17 insertions, 17 deletions

diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index a5ed8b2ea3..545b9a3d1e 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -116,7 +116,7 @@ set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<
 
 set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)
 
-!!IF contains(QT_CONFIG, reduce_exports)
+!!IF qtConfig(reduce_exports)
 set(QT_VISIBILITY_AVAILABLE \"True\")
 !!ENDIF
 
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index 2b9166f0a6..b628bcc6ec 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -4,4 +4,4 @@ HEADERS += \
     arch/qatomic_bootstrap.h \
     arch/qatomic_cxx11.h
 
-atomic64-libatomic: QMAKE_USE += libatomic
+qtConfig(libatomic): QMAKE_USE += libatomic
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index 275ade369a..58fde6cfc0 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -17,7 +17,7 @@ SOURCES += \
     codecs/qtsciicodec.cpp \
     codecs/qutfcodec.cpp
 
-contains(QT_CONFIG,icu) {
+qtConfig(icu) {
     HEADERS += \
         codecs/qicucodec_p.h
     SOURCES += \
@@ -41,13 +41,13 @@ contains(QT_CONFIG,icu) {
         codecs/qbig5codec.cpp
 
     unix:!qnx:!darwin:!linux-android-* {
-        contains(QT_CONFIG, iconv) {
+        qtConfig(iconv) {
             HEADERS += codecs/qiconvcodec_p.h
             SOURCES += codecs/qiconvcodec.cpp
-            contains(QT_CONFIG, gnu-libiconv) {
+            qtConfig(gnu-libiconv) {
                 DEFINES += GNU_LIBICONV
                 QMAKE_USE_PRIVATE += iconv
-            } else: contains(QT_CONFIG, sun-libiconv) {
+            } else: qtConfig(sun-libiconv) {
                 DEFINES += GNU_LIBICONV
             }
         }
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index ab345e9aae..cc658afa94 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -169,7 +169,7 @@ win32 {
                 io/qstorageinfo_unix.cpp
         }
 
-        linux|if(qnx:contains(QT_CONFIG, inotify)) {
+        linux|if(qnx:qtConfig(inotify)) {
             SOURCES += io/qfilesystemwatcher_inotify.cpp
             HEADERS += io/qfilesystemwatcher_inotify_p.h
         }
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index fea0d4ae2e..2388bbe9be 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -147,12 +147,12 @@ unix|integrity {
             kernel/qpoll_p.h \
             kernel/qtimerinfo_unix_p.h
 
-    contains(QT_CONFIG, poll_select): SOURCES += kernel/qpoll.cpp
-    contains(QT_CONFIG, poll_poll): DEFINES += QT_HAVE_POLL
-    contains(QT_CONFIG, poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL
-    contains(QT_CONFIG, poll_pollts): DEFINES += QT_HAVE_POLL QT_HAVE_POLLTS
+    qtConfig(poll_select): SOURCES += kernel/qpoll.cpp
+    qtConfig(poll_poll): DEFINES += QT_HAVE_POLL
+    qtConfig(poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL
+    qtConfig(poll_pollts): DEFINES += QT_HAVE_POLL QT_HAVE_POLLTS
 
-    contains(QT_CONFIG, glib) {
+    qtConfig(glib) {
         SOURCES += \
             kernel/qeventdispatcher_glib.cpp
         HEADERS += \
@@ -160,7 +160,7 @@ unix|integrity {
         QMAKE_USE_PRIVATE += glib
     }
 
-   contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
+   qtConfig(clock-gettime): include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
 
     !android {
         SOURCES += kernel/qsharedmemory_posix.cpp \
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 252dcf9fdc..7ebd9cf710 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -146,14 +146,14 @@ else:win32 {
     SOURCES += tools/qlocale_unix.cpp
 }
 
-contains(QT_CONFIG, system-zlib) {
+qtConfig(system-zlib) {
     include($$PWD/../../3rdparty/zlib_dependency.pri)
 } else {
     CONFIG += no_core_dep
     include($$PWD/../../3rdparty/zlib.pri)
 }
 
-contains(QT_CONFIG,icu) {
+qtConfig(icu) {
     include($$PWD/../../3rdparty/icu_dependency.pri)
 
     SOURCES += tools/qlocale_icu.cpp \
@@ -192,9 +192,9 @@ INCLUDEPATH += ../3rdparty/md5 \
                ../3rdparty/md4 \
                ../3rdparty/sha3
 
-contains(QT_CONFIG, system-doubleconversion) {
+qtConfig(system-doubleconversion) {
     QMAKE_USE_PRIVATE += doubleconversion
-} else: contains(QT_CONFIG, doubleconversion) {
+} else: qtConfig(doubleconversion) {
     include($$PWD/../../3rdparty/double-conversion/double-conversion.pri)
 }