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>

configure.json

@@ -1241,10 +1241,17 @@
             "condition": "!config.uikit && !config.integrity",
             "output": [
                 "shared",
+                "publicFeature",
                 "publicQtConfig",
-                "publicConfig",
+                "publicConfig"
-                { "type": "publicQtConfig", "negative": true, "name": "static" },
+            ]
-                { "type": "publicConfig", "negative": true, "name": "static" }
+        },
+        "static": {
+            "condition": "!features.shared",
+            "output": [
+                "publicFeature",
+                "publicQtConfig",
+                "publicConfig"
             ]
         },
         "cross_compile": {
@@ -1282,6 +1289,7 @@
             "autoDetect": "!config.darwin && !config.win32",
             "condition": "tests.pkg-config",
             "output": [
+                "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
                 "pkgConfig"
             ]
@@ -1296,6 +1304,7 @@
             "autoDetect": false,
             "output": [
                 { "type": "define", "name": "QT_BUILD_INTERNAL" },
+                { "type": "privateFeature", "name": "private_tests" },
                 { "type": "publicQtConfig", "name": "private_tests" }
             ]
         },
@@ -1307,7 +1316,7 @@
             "description": "Compile libs in debug and release mode",
             "autoDetect": "input.debug == ''",
             "condition": "config.darwin || config.win32",
-            "output": [ "publicQtConfig", "debugAndRelease" ]
+            "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
         },
         "force_debug_info": {
             "description": "Add debug info in release mode",
@@ -1322,25 +1331,25 @@
                 "features.debug || features.debug_and_release || features.force_debug_info",
                 "config.darwin || tests.separate_debug_info"
             ],
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "release_tools": {
             "description": "Compile tools in release mode",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature", "publicQtConfig" ]
         },
         "simulator_and_device": {
             "description": "Build for both simulator and device",
             "condition": "config.uikit && input.sdk == ''",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "build_all": {
             "condition": "features.debug_and_release || features.simulator_and_device",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "rpath": {
             "description": "Build with RPATH",
             "autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "rpath_dir": {
             "description": "RPATH directory",
@@ -1357,7 +1366,7 @@
         "force_asserts": {
             "description": "Force assertions",
             "autoDetect": false,
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature" ]
         },
         "warnings_are_errors": {
             "description": "WError",
@@ -1374,6 +1383,7 @@
             "condition": "config.darwin && features.shared",
             "output": [
                 { "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" },
+                "publicFeature",
                 { "type": "publicQtConfig", "name": "qt_framework"},
                 { "type": "publicConfig", "name": "qt_framework"}
             ]
@@ -1459,17 +1469,17 @@
         },
         "c++11": {
             "description": "C++11",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c++14": {
             "description": "C++14",
             "condition": "features.c++11 && tests.c++14",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c++1z": {
             "description": "C++1z",
             "condition": "features.c++14 && tests.c++1z",
-            "output": [ "publicQtConfig" ]
+            "output": [ "publicFeature", "publicQtConfig" ]
         },
         "compiler": {
             "description": "Compiler version",
@@ -1498,6 +1508,7 @@
             "description": "Reduce amount of exported symbols",
             "condition": "!config.win32 && tests.reduce_exports",
             "output": [
+                "privateFeature",
                 "publicQtConfig",
                 { "type": "define", "name": "QT_VISIBILITY_AVAILABLE" }
             ]
@@ -1506,6 +1517,7 @@
             "description": "Reduce amount of relocations",
             "condition": "!config.win32 && tests.reduce_relocations",
             "output": [
+                "privateFeature",
                 "publicQtConfig",
                 { "type": "define", "name": "QT_REDUCE_RELOCATIONS" }
             ]
@@ -1523,10 +1535,12 @@
         "std-atomic64": {
             "description": "64 bit atomic operations",
             "condition": "tests.atomic64 || libs.libatomic",
-            "output": [
+            "output": [ { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" } ]
-                { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" },
+        },
-                { "type": "privateConfig", "name": "atomic64-libatomic", "condition": "!tests.atomic64" }
+        "libatomic": {
-            ]
+            "description": "64 bit atomic operations in libatomic",
+            "condition": "!tests.atomic64 && libs.libatomic",
+            "output": [ "privateFeature" ]
         },
         "sse2": {
             "description": "SSE2",
@@ -1683,7 +1697,7 @@
         "clock-gettime": {
             "description": "clock_gettime()",
             "condition": "tests.clock-gettime",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "clock-monotonic": {
             "description": "POSIX monotonic clock",
@@ -1723,7 +1737,7 @@
         "inotify": {
             "description": "inotify",
             "condition": "tests.inotify",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "ipv6ifname": {
             "description": "IPv6 ifname",
@@ -1734,23 +1748,23 @@
             "description": "libproxy",
             "autoDetect": false,
             "condition": "libs.libproxy",
-            "output": [ "feature" ]
+            "output": [ "privateFeature" ]
         },
         "linuxfb": {
             "description": "LinuxFB",
             "condition": "tests.linuxfb",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "directfb": {
             "description": "DirectFB",
             "autoDetect": false,
             "condition": "libs.directfb",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "integrityfb": {
             "description": "INTEGRITY framebuffer",
             "condition": "config.integrity",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "kms": {
             "description": "KMS",
@@ -1760,7 +1774,7 @@
         "mirclient": {
             "description": "Mir client",
             "condition": "libs.mirclient",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "mremap": {
             "description": "mremap()",
@@ -1781,7 +1795,7 @@
         "posix_fallocate": {
             "description": "POSIX fallocate()",
             "condition": "tests.posix_fallocate",
-            "output": [ "feature" ]
+            "output": [ "privateFeature" ]
         },
         "syslog": {
             "description": "syslog",
@@ -1822,26 +1836,26 @@
             "description": "Native ppoll()",
             "emitIf": "!config.win32",
             "condition": "tests.ppoll",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "poll_pollts": {
             "description": "Native pollts()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && tests.pollts",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "poll_poll": {
             "description": "Native poll()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && !features.poll_pollts && tests.poll",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "poll_select": {
             "description": "Emulated poll()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && !features.poll_pollts && !features.poll_poll",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "define", "name": "QT_NO_NATIVE_POLL" }
             ]
         },
@@ -1878,14 +1892,14 @@
             "description": "CoreWLan",
             "condition": "libs.corewlan",
             "emitIf": "config.darwin",
-            "output": [ "feature" ]
+            "output": [ "feature", "privateFeature" ]
         },
         "securetransport": {
             "description": "SecureTransport",
             "disable": "input.securetransport == 'no' || input.ssl == 'no'",
             "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "define", "name": "QT_SECURETRANSPORT" }
             ]
         },
@@ -1896,6 +1910,7 @@
             "autoDetect": "!config.winrt",
             "condition": "!features.securetransport && tests.openssl",
             "output": [
+                "privateFeature",
                 { "type": "publicQtConfig", "condition": "!features.openssl-linked" },
                 { "type": "define", "negative": true, "name": "QT_NO_OPENSSL" }
             ]
@@ -1906,7 +1921,7 @@
             "disable": "input.openssl != 'linked'",
             "condition": "features.openssl && libs.openssl",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "varAssign", "name": "OPENSSL_LIBS", "value": "libs.openssl.libs", "eval": "true" },
                 { "type": "varAssign", "name": "OPENSSL_LIBS_DEBUG", "value": "libs.openssl.builds.debug.libs",
                   "eval": "true", "condition": "config.win32" },
@@ -1918,41 +1933,40 @@
         "ssl": {
             "description": "SSL",
             "condition": "config.winrt || features.securetransport || features.openssl",
-            "output": [ "feature" ]
+            "output": [ "publicFeature", "feature" ]
         },
         "sctp": {
             "description": "SCTP",
             "autoDetect": false,
             "condition": "tests.sctp",
-            "output": [ "feature" ]
+            "output": [ "publicFeature", "feature" ]
         },
         "accessibility": {
             "description": "Accessibility",
-            "output": [ "feature" ]
+            "output": [ "publicFeature", "feature" ]
         },
         "accessibility-atspi-bridge": {
             "description": "ATSPI Bridge",
-            "emitIf": "features.accessibility && features.xcb",
+            "condition": "features.accessibility && features.xcb && features.dbus",
-            "condition": "features.dbus",
+            "output": [ "privateFeature", "feature" ]
-            "output": [ "feature" ]
         },
         "glib": {
             "description": "GLib",
             "autoDetect": "!config.win32",
             "condition": "libs.glib",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "gtk3": {
             "description": "GTK+",
             "autoDetect": "!config.darwin",
             "condition": "features.glib && libs.gtk3",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "icu": {
             "description": "ICU",
             "autoDetect": "!config.win32",
             "condition": "libs.icu",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "pulseaudio": {
             "description": "PulseAudio",
@@ -1962,13 +1976,13 @@
         "cups": {
             "description": "CUPS",
             "condition": "libs.cups",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "jpeg": {
             "description": "JPEG",
             "disable": "input.libjpeg == 'no'",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_JPEG" }
             ]
         },
@@ -1977,12 +1991,12 @@
             "disable": "input.libjpeg == 'qt'",
             "enable": "input.libjpeg == 'system'",
             "condition": "features.jpeg && libs.libjpeg",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "gif": {
             "description": "GIF",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_GIF" }
             ]
         },
@@ -1990,7 +2004,7 @@
             "description": "PNG",
             "disable": "input.libpng == 'no'",
             "output": [
-                "publicQtConfig",
+                "privateFeature",
                 { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_PNG" }
             ]
         },
@@ -1999,21 +2013,21 @@
             "disable": "input.libpng == 'qt'",
             "enable": "input.libpng == 'system'",
             "condition": "features.png && libs.libpng",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "ico": {
             "description": "ICO",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "system-zlib": {
             "description": "Using system zlib",
             "condition": "libs.zlib",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "iconv": {
             "description": "iconv",
             "condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "posix-libiconv": {
             "description": "POSIX iconv",
@@ -2026,18 +2040,18 @@
             "enable": "input.iconv == 'sun'",
             "disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'",
             "condition": "!config.win32 && !features.posix-libiconv && tests.sun-iconv",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature", "publicQtConfig" ]
         },
         "gnu-libiconv": {
             "description": "GNU iconv",
             "enable": "input.iconv == 'gnu'",
             "disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'",
             "condition": "!config.win32 && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "freetype": {
             "description": "FreeType",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "system-freetype": {
             "description": "  Using system FreeType",
@@ -2045,16 +2059,16 @@
             "disable": "input.freetype == 'qt'",
             "autoDetect": "!config.win32",
             "condition": "features.freetype && libs.freetype",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "fontconfig": {
             "description": "Fontconfig",
             "condition": "!config.win32 && features.system-freetype && libs.fontconfig",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "harfbuzz": {
             "description": "HarfBuzz",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "system-harfbuzz": {
             "description": "  Using system HarfBuzz",
@@ -2062,23 +2076,23 @@
             "disable": "input.harfbuzz == 'qt'",
             "autoDetect": "!config.darwin && !config.win32",
             "condition": "features.harfbuzz && libs.harfbuzz",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "concurrent": {
             "description": "Qt Concurrent",
-            "output": [ "feature" ]
+            "output": [ "publicFeature", "feature" ]
         },
         "dbus": {
             "description": "Qt D-Bus",
             "autoDetect": "!config.android && !config.winrt",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "dbus-linked": {
             "description": "Qt D-Bus directly linked to libdbus",
             "enable": "input.dbus == 'linked'",
             "disable": "input.dbus == 'runtime'",
             "condition": "features.dbus && libs.dbus",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "host-dbus": {
             "description": "Qt D-Bus (Host)",
@@ -2099,65 +2113,69 @@
         },
         "gui": {
             "description": "Qt Gui",
-            "output": [ { "type": "publicQtConfig", "negative": true } ]
+            "output": [
+                "privateFeature",
+                { "type": "publicQtConfig", "negative": true }
+            ]
         },
         "widgets": {
             "description": "Qt Widgets",
             "condition": "features.gui",
             "output": [
+                "privateFeature",
                 { "type": "define", "negative": true, "name": "QT_NO_WIDGETS" },
                 { "type": "publicQtConfig", "negative": true }
             ]
         },
         "system-proxies": {
             "description": "Use system proxies",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "egl": {
             "description": "EGL",
             "condition": "features.opengl && (features.angle || libs.egl)",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "egl_x11": {
             "description": "EGL on X11",
             "condition": "features.egl && tests.egl-x11",
-            "output": [ "feature" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs": {
             "description": "EGLFS",
             "autoDetect": "!config.android && !config.win32",
             "condition": "features.egl",
-            "output": [ "feature" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_brcm": {
             "description": "EGLFS Rasberry Pi",
             "condition": "features.eglfs && tests.egl-brcm",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_egldevice": {
             "description": "EGLFS EGLDevice",
             "condition": "features.eglfs && tests.egl-egldevice && features.kms",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_gbm": {
             "description": "EGLFS GBM",
             "condition": "features.eglfs && features.gbm && features.kms",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_mali": {
             "description": "EGLFS Mali",
             "condition": "features.eglfs && (tests.egl-mali || tests.egl-mali-2)",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_viv": {
             "description": "EGLFS i.Mx6",
             "condition": "features.eglfs && tests.egl-viv",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "eglfs_viv_wl": {
             "description": "EGLFS i.Mx6 Wayland",
             "condition": "features.eglfs_viv && libs.wayland_server",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "libudev": {
             "description": "udev",
@@ -2172,7 +2190,7 @@
         "xkbcommon-evdev": {
             "description": "xkbcommon-evdev",
             "condition": "libs.xkbcommon",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xkbcommon-system": {
             "description": "Using system-provided xkbcommon",
@@ -2180,7 +2198,7 @@
             "enable": "input.xkbcommon == 'system'",
             "disable": "input.xkbcommon == 'qt' || input.xkbcommon == 'no'",
             "condition": "libs.xkbcommon_x11",
-            "output": [ { "type": "publicQtConfig", "negative": true, "name": "xkbcommon-qt" } ]
+            "output": [ "privateFeature" ]
         },
         "xkb-config-root": {
             "description": "XKB config root",
@@ -2191,18 +2209,18 @@
         "xinput2": {
             "description": "Xinput2",
             "condition": "libs.xinput2",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "doubleconversion": {
             "description": "DoubleConversion",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "system-doubleconversion": {
             "description": "  Using system DoubleConversion",
             "enable": "input.doubleconversion == 'system'",
             "disable": "input.doubleconversion == 'qt'",
             "condition": "features.doubleconversion && libs.doubleconversion",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "system-pcre": {
             "description": "Using system PCRE",
@@ -2229,42 +2247,39 @@
             "description": "XCB",
             "autoDetect": "!config.darwin",
             "condition": "libs.xcb",
-            "output": [
+            "output": [ "privateFeature" ]
-                "publicQtConfig",
-                { "type": "publicQtConfig", "name": "xcb-qt", "condition": "!features.system-xcb" },
-                { "type": "publicQtConfig", "name": "xcb-plugin" }
-            ]
         },
         "system-xcb": {
             "description": "Using system provided XCB libraries",
             "enable": "input.xcb == 'system' || input.xcb == 'yes'",
             "disable": "input.xcb == 'qt' || input.xcb == 'no'",
             "autoDetect": "!config.darwin",
-            "condition": "libs.xcb && libs.xcb_syslibs"
+            "condition": "libs.xcb && libs.xcb_syslibs",
+            "output": [ "privateFeature" ]
         },
         "xcb-render": {
             "description": "XCB render",
             "emitIf": "features.system-xcb",
             "condition": "libs.xcb_render",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xcb-glx": {
             "description": "XCB GLX",
             "emitIf": "features.xcb",
             "condition": "libs.xcb_glx",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xcb-xlib": {
             "description": "XCB Xlib",
             "emitIf": "features.xcb",
             "condition": "libs.xcb_xlib",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xcb-sm": {
             "description": "xcb-sm",
             "emitIf": "features.xcb",
             "condition": "features.sessionmanager && libs.x11sm",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xkb": {
             "description": "XCB XKB",
@@ -2274,12 +2289,12 @@
         "xlib": {
             "description": "XLib",
             "condition": "tests.xlib",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "xrender": {
             "description": "Xrender",
             "condition": "libs.xrender",
-            "output": [ "feature" ]
+            "output": [ "privateFeature", "feature" ]
         },
         "x11-prefix": {
             "description": "X11 prefix",
@@ -2290,7 +2305,7 @@
             "description": "ANGLE",
             "autoDetect": "features.opengles2 || features.opengl-dynamic",
             "condition": "config.win32 && tests.directx",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "opengles2": {
             "description": "OpenGL ES 2.0",
@@ -2298,6 +2313,7 @@
             "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'",
             "condition": "config.win32 || (!features.opengl-desktop && libs.opengl_es2)",
             "output": [
+                "publicFeature",
                 "publicQtConfig",
                 { "type": "define", "name": "QT_OPENGL_ES" },
                 { "type": "define", "name": "QT_OPENGL_ES_2" }
@@ -2306,12 +2322,18 @@
         "opengles3": {
             "description": "OpenGL ES 3.0",
             "condition": "features.opengles2 && !features.angle && tests.opengles3",
-            "output": [ { "type": "define", "name": "QT_OPENGL_ES_3" } ]
+            "output": [
+                "publicFeature",
+                { "type": "define", "name": "QT_OPENGL_ES_3" }
+            ]
         },
         "opengles31": {
             "description": "OpenGL ES 3.1",
             "condition": "features.opengles3 && tests.opengles31",
-            "output": [ { "type": "define", "name": "QT_OPENGL_ES_3_1" } ]
+            "output": [
+                "publicFeature",
+                { "type": "define", "name": "QT_OPENGL_ES_3_1" }
+            ]
         },
         "opengl-desktop": {
             "description": "Desktop OpenGL",
@@ -2326,14 +2348,14 @@
             "autoDetect": false,
             "condition": "config.win32 && !config.winrt",
             "output": [
-                { "type": "feature", "name": "dynamicgl" },
+                { "type": "publicFeature", "name": "dynamicgl" },
                 { "type": "define", "name": "QT_OPENGL_DYNAMIC" }
             ]
         },
         "opengl": {
             "description": "OpenGL",
             "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2",
-            "output": [ "feature" ]
+            "output": [ "publicFeature", "feature" ]
         },
         "db2": {
             "description": "DB2 (IBM)",
@@ -2431,19 +2453,19 @@
             "description": "DirectWrite",
             "emitIf": "config.win32",
             "condition": "libs.directwrite",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "directwrite2": {
             "description": "DirectWrite 2",
             "emitIf": "config.win32",
             "condition": "features.directwrite && tests.directwrite2",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "direct2d": {
             "description": "Direct 2D",
             "autoDetect": false,
             "condition": "tests.direct2d",
-            "output": [ "publicQtConfig" ]
+            "output": [ "privateFeature" ]
         },
         "sessionmanager": {
             "description": "Session Management",

examples/examples.pro

@@ -15,7 +15,7 @@ SUBDIRS = \
     widgets \
     xml
 
-contains(QT_CONFIG, opengl): SUBDIRS += opengl
+qtConfig(opengl): SUBDIRS += opengl
 
 aggregate.files = aggregate/examples.pro
 aggregate.path = $$[QT_INSTALL_EXAMPLES]

examples/gui/gui.pro

@@ -5,6 +5,6 @@ CONFIG += no_docs_target
 
 SUBDIRS += analogclock
 SUBDIRS += rasterwindow
-contains(QT_CONFIG, opengl(es2)?) {
+qtConfig(opengl(es2)?) {
     SUBDIRS += openglwindow
 }

examples/network/network.pro

@@ -30,9 +30,9 @@ qtHaveModule(widgets) {
 
     }
 
-    contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
+    qtConfig(openssl): SUBDIRS += securesocketclient
-    contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
+    qtConfig(openssl-linked): SUBDIRS += securesocketclient
-    contains(QT_CONFIG, sctp):SUBDIRS += multistreamserver multistreamclient
+    qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient
 }
 
 EXAMPLE_FILES = shared

examples/opengl/legacy/framebufferobject2/framebufferobject2.pro

@@ -8,4 +8,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/grabber/grabber.pro

@@ -9,4 +9,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/hellogl/hellogl.pro

@@ -14,4 +14,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/legacy.pro

@@ -2,7 +2,7 @@ requires(qtHaveModule(opengl))
 
 TEMPLATE      = subdirs
 
-!contains(QT_CONFIG, dynamicgl): !contains(QT_CONFIG, opengles2) {
+!qtConfig(dynamicgl):!qtConfig(opengles2) {
     # legacy desktop-only examples, no dynamic GL support
     SUBDIRS   = \
                 grabber \

examples/opengl/legacy/overpainting/overpainting.pro

@@ -16,4 +16,4 @@ SOURCES = bubble.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/pbuffers/pbuffers.pro

@@ -10,4 +10,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/pbuffers2/pbuffers2.pro

@@ -8,4 +8,4 @@ RESOURCES += pbuffers2.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")

examples/opengl/legacy/samplebuffers/samplebuffers.pro

@@ -7,4 +7,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")

examples/widgets/graphicsview/boxes/boxes.pro

@@ -1,6 +1,6 @@
 QT += opengl widgets
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
 
 HEADERS += 3rdparty/fbm.h \
            glbuffers.h \

examples/widgets/graphicsview/graphicsview.pro

@@ -15,6 +15,6 @@ SUBDIRS       = \
 
 contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot
 
-qtHaveModule(opengl):!contains(QT_CONFIG, opengles.):!contains(QT_CONFIG,dynamicgl) {
+qtHaveModule(opengl):!qtConfig(opengles.):!qtConfig(dynamicgl) {
     SUBDIRS += boxes
 }

examples/widgets/painting/composition/composition.pro

@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += composition.qrc
-qtHaveModule(opengl): !contains(QT_CONFIG,dynamicgl) {
+qtHaveModule(opengl):!qtConfig(dynamicgl) {
     DEFINES += USE_OPENGL
     QT += opengl
 }

examples/widgets/painting/shared/shared.pri

@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-qtHaveModule(opengl)|contains(QT_CONFIG, opengles2)  {
+qtHaveModule(opengl)|qtConfig(opengles2)  {
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl widgets
 }

examples/widgets/widgets.pro

@@ -22,11 +22,11 @@ SUBDIRS       = \
                 tutorials \
                 widgets
 
-contains(QT_CONFIG, opengl(es2)?) {
+qtConfig(opengl(es2)?) {
     SUBDIRS += windowcontainer
 }
 
-!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= windowcontainer
+!qtConfig(opengl(es2)?): SUBDIRS -= windowcontainer
 contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
 contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop
 mac:SUBDIRS += mac

mkspecs/features/ctest_testcase_common.prf

@@ -69,8 +69,8 @@ for (dep, dependentmodules): \
         mod_deps += $$cmakeModuleName($$dep)
 dependentmodules = $$join(mod_deps, ";")
 
-contains(QT_CONFIG, angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True
+qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True
-!contains(QT_CONFIG, egl): CMAKE_GL_DEFINES += -DNO_EGL=True
+!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True
 
 CMAKE_MODULE_VERSIONS =
 CMAKE_MODULES_UNDER_TEST =

mkspecs/features/mac/default_post.prf

@@ -2,11 +2,11 @@ load(default_post)
 !no_objective_c:CONFIG += objective_c
 
 qt {
-    contains(QT_CONFIG, static) {
+    qtConfig(static) {
         # C++11 support means using libc++ instead of libstd++. As the
         # two libraries are incompatible we need to ensure the end user
         # project is built using the same C++11 support/no support as Qt.
-        contains(QT_CONFIG, c++11) {
+        qtConfig(c++11) {
             CONFIG += c++11
         } else: c++11 {
             warning("Qt was not built with C++11 enabled, disabling feature")

mkspecs/features/mac/default_pre.prf

@@ -40,7 +40,7 @@ isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
 # and put it into a dSYM file. We don't need that dSYM file in
 # the first place, since the information is available in the
 # object files inside the archives (static libraries).
-contains(QT_CONFIG, static): \
+macx-xcode:qtConfig(static): \
     QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
 
 # This variable is used by the xcode_dynamic_library_suffix

mkspecs/features/qml_plugin.prf

@@ -15,9 +15,9 @@ TEMPLATE = lib
 CONFIG += plugin
 
 if(win32|mac):!macx-xcode {
-    contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
+    qtConfig(simulator_and_device): CONFIG += simulator_and_device
-    contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+    qtConfig(debug_and_release): CONFIG += debug_and_release
-    contains(QT_CONFIG, build_all): CONFIG += build_all
+    qtConfig(build_all): CONFIG += build_all
 }
 
 CONFIG += relative_qt_rpath  # Qt's QML plugins should be relocatable

mkspecs/features/qpa/basicunixfontdatabase.prf

@@ -1,3 +1,3 @@
-contains(QT_CONFIG, system-freetype) {
+qtConfig(system-freetype) {
     LIBS_PRIVATE += -lfreetype
 }

mkspecs/features/qpa/genericunixfontdatabase.prf

@@ -1,5 +1,5 @@
 CONFIG += qpa/basicunixfontdatabase
-contains(QT_CONFIG, fontconfig) {
+qtConfig(fontconfig) {
     DEFINES += Q_FONTCONFIGDATABASE
     LIBS_PRIVATE += -lfontconfig
 } else:!android {

mkspecs/features/qt.prf

@@ -2,14 +2,14 @@ CONFIG *= thread
 
 #handle defines
 win32 {
-   contains(QT_CONFIG, shared) {
+   qtConfig(shared) {
       # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp
       # function VcprojGenerator::initDeploymentTool()
       QMAKE_DLL_PATHS += $$[QT_INSTALL_BINS/get]
    }
 }
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
-contains(QT_CONFIG, force_asserts):DEFINES += QT_FORCE_ASSERTS
+qtConfig(force_asserts): DEFINES += QT_FORCE_ASSERTS
 no_keywords:DEFINES += QT_NO_KEYWORDS
 plugin { #Qt plugins
    static:DEFINES += QT_STATICPLUGIN
@@ -165,7 +165,7 @@ for(ever) {
 qt_module_deps = $$CLEAN_QT $$CLEAN_QT_PRIVATE
 qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
 
-!no_qt_rpath:!static:contains(QT_CONFIG, rpath):!contains(QT_CONFIG, static):\
+!no_qt_rpath:!static:qtConfig(rpath):!qtConfig(static):\
         contains(qt_module_deps, core) {
     relative_qt_rpath:!isEmpty(QMAKE_REL_RPATH_BASE):contains(INSTALLS, target):\
             isEmpty(target.files):isEmpty(target.commands):isEmpty(target.extra) {
@@ -176,7 +176,7 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
     }
 }
 
-!isEmpty(QMAKE_LFLAGS_RPATHLINK):!contains(QT_CONFIG, static) {
+!isEmpty(QMAKE_LFLAGS_RPATHLINK):!qtConfig(static) {
     # -rpath-link is used by the linker to find dependencies of dynamic
     # libraries which were NOT specified on the command line.
     # This means that paths of direct dependencies (QT & QT_PRIVATE)
@@ -191,7 +191,7 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
 
 # static builds: link qml import plugins into the app.
 contains(qt_module_deps, qml): \
-        contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan {
+        qtConfig(static):contains(TEMPLATE, .*app):!host_build:!no_import_scan {
     !isEmpty(QTREPOS) {
         for (qrep, QTREPOS): \
             exists($$qrep/qml): \
@@ -318,7 +318,7 @@ contains(TEMPLATE, .*app) {
 }
 
 QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN
-contains(QT_CONFIG, static) {
+qtConfig(static) {
     QT_PLUGIN_VERIFY += QTPLUGIN
     force_import_plugins|contains(TEMPLATE, .*app) {
         import_plugins:!isEmpty(QTPLUGIN) {

mkspecs/features/qt_app.prf

@@ -21,14 +21,14 @@ QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
 
 host_build: QT -= gui   # no host tool will ever use gui
 host_build:force_bootstrap {
-    !build_pass:contains(QT_CONFIG, release_tools): CONFIG += release
+    !build_pass:qtConfig(release_tools): CONFIG += release
     contains(QT, core(-private)?|xml) {
         QT -= core core-private xml
         QT += bootstrap-private
     }
     target.path = $$[QT_HOST_BINS]
 } else {
-    !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
+    !build_pass:qtConfig(debug_and_release): CONFIG += release
     target.path = $$[QT_INSTALL_BINS]
     CONFIG += relative_qt_rpath  # Qt's tools and apps should be relocatable
 }

mkspecs/features/qt_common.prf

@@ -12,14 +12,14 @@
 QMAKE_DIR_REPLACE_SANE += DESTDIR
 CONFIG -= debug_and_release_target
 
-contains(QT_CONFIG, c++11): CONFIG += c++11 strict_c++
+qtConfig(c++11): CONFIG += c++11 strict_c++
-contains(QT_CONFIG, c++14): CONFIG += c++14
+qtConfig(c++14): CONFIG += c++14
-contains(QT_CONFIG, c++1z): CONFIG += c++1z
+qtConfig(c++1z): CONFIG += c++1z
 contains(TEMPLATE, .*lib) {
     # module and plugins
-    !host_build:contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
+    !host_build:qtConfig(reduce_exports): CONFIG += hide_symbols
-    unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
+    unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions
-    contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info
+    qtConfig(separate_debug_info): CONFIG += separate_debug_info
 
     !isEmpty(_QMAKE_SUPER_CACHE_): \
         rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*

mkspecs/features/qt_functions.prf

@@ -16,7 +16,7 @@ defineReplace(qtPlatformTargetSuffix) {
 
 defineReplace(qtLibraryTarget) {
    LIBRARY_NAME = $$1
-   CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
+   CONFIG(shared, static|shared):qtConfig(framework) {
       QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
       export(QMAKE_FRAMEWORK_BUNDLE_NAME)
    }
@@ -196,7 +196,7 @@ defineTest(qtAddTargetEnv) {
         } else:contains(QMAKE_HOST.os, Haiku) {
             deppath.name = LIBRARY_PATH
         } else:equals(QMAKE_HOST.os, Darwin) {
-            contains(QT_CONFIG, qt_framework): \
+            qtConfig(framework): \
                 deppath.name = DYLD_FRAMEWORK_PATH
             else: \
                 deppath.name = DYLD_LIBRARY_PATH
@@ -259,7 +259,7 @@ defineReplace(pkgConfigExecutable) {
 }
 
 defineTest(packagesExist) {
-    contains(QT_CONFIG, no-pkg-config) {
+    !qtConfig(pkg-config) {
         warning("pkg-config disabled, can't check package existence")
         return(false)
     }

mkspecs/features/qt_helper_lib.prf

@@ -18,15 +18,15 @@ QT =  # In case qt is re-added.
 CONFIG -= warning_clean  # Don't presume 3rd party code to be clean
 load(qt_common)
 
-contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
+qtConfig(simulator_and_device): CONFIG += simulator_and_device
-contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+qtConfig(debug_and_release): CONFIG += debug_and_release
-contains(QT_CONFIG, build_all): CONFIG += build_all
+qtConfig(build_all): CONFIG += build_all
 
 DESTDIR = $$MODULE_BASE_OUTDIR/lib
 DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
 
 # In static builds of Qt, convenience libraries must be installed,
 # as in this case they are not linked to the final library/plugin.
-installed|if(!not_installed:contains(QT_CONFIG, static)): load(qt_installs)
+installed|if(!not_installed:qtConfig(static)): load(qt_installs)
 
 TARGET = $$qt5LibraryTarget($$TARGET)

mkspecs/features/qt_module.prf

@@ -32,17 +32,17 @@ host_build {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS_SPLIT_SECTIONS
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SPLIT_SECTIONS
     force_bootstrap {
-        !build_pass:contains(QT_CONFIG, release_tools): CONFIG += release
+        !build_pass:qtConfig(release_tools): CONFIG += release
         contains(QT, core(-private)?|xml) {
             QT -= core core-private xml
             QT += bootstrap-private
         }
     } else {
-        !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
+        !build_pass:qtConfig(debug_and_release): CONFIG += release
     }
 }
 
-CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
+CONFIG(shared, static|shared):qtConfig(framework): \
     CONFIG += lib_bundle
 
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
@@ -89,9 +89,9 @@ INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.inclu
 # If Qt was configured with -debug-and-release then build the module the same way
 # - unless this is a host library
 !host_build:if(win32|mac):!macx-xcode {
-    contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
+    qtConfig(simulator_and_device): CONFIG += simulator_and_device
-    contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+    qtConfig(debug_and_release): CONFIG += debug_and_release
-    contains(QT_CONFIG, build_all): CONFIG += build_all
+    qtConfig(build_all): CONFIG += build_all
 }
 
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
@@ -140,7 +140,7 @@ mac {
        QMAKE_CXXFLAGS += -fconstant-cfstrings
    }
 
-   contains(QT_CONFIG, rpath): \
+   qtConfig(rpath): \
        QMAKE_SONAME_PREFIX = @rpath
    else: \
        CONFIG += absolute_library_soname
@@ -167,7 +167,7 @@ aix-g++* {
      QMAKE_CXXFLAGS += -mminimal-toc
 }
 
-sse2:!contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):!host_build:!if(static:contains(QT_CONFIG, shared)) {
+sse2:!contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):!host_build:!if(static:qtConfig(shared)) {
     # If the compiler supports SSE2, enable it unconditionally in all of Qt shared libraries
     # (and only the libraries). This is not expected to be a problem because:
     # - on Windows, sharing of libraries is uncommon

mkspecs/features/qt_module_headers.prf

@@ -16,7 +16,7 @@ load(qt_build_paths)
     minimal_syncqt {
         QMAKE_SYNCQT += -minimal $$QMAKE_SYNCQT_OPTIONS
     } else {
-        contains(QT_CONFIG, private_tests): \   # -developer-build
+        qtConfig(private_tests): \   # -developer-build
             QMAKE_SYNCQT += -check-includes
     }
     for(mod, MODULE_INCNAME): \
@@ -230,7 +230,7 @@ headersclean:!internal_module {
                         $$[QT_INSTALL_DATA/src]/mkspecs/features/data/dummy.cpp
     }
 
-    !isEmpty(hcleanCOMMAND):if(!contains(QT_CONFIG, debug_and_release)|CONFIG(release, debug|release)) {
+    !isEmpty(hcleanCOMMAND):if(!qtConfig(debug_and_release)|CONFIG(release, debug|release)) {
         header_check.dependency_type = TYPE_C
         header_check.CONFIG += no_link
         header_check.output = ${QMAKE_VAR_OBJECTS_DIR}header_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}

mkspecs/features/qt_plugin.prf

@@ -24,11 +24,11 @@ win32:CONFIG(shared, static|shared) {
 }
 
 tool_plugin {
-    !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
+    !build_pass:qtConfig(debug_and_release): CONFIG += release
 } else:if(win32|mac):!macx-xcode {
-    contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
+    qtConfig(simulator_and_device): CONFIG += simulator_and_device
-    contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+    qtConfig(debug_and_release): CONFIG += debug_and_release
-    contains(QT_CONFIG, build_all): CONFIG += build_all
+    qtConfig(build_all): CONFIG += build_all
 }
 
 CONFIG += relative_qt_rpath  # Qt's plugins should be relocatable

mkspecs/features/resolve_config.prf

@@ -41,7 +41,7 @@ CONFIG(debug, debug|release) {
     # or not debug_and_release is active.
     for(build, $$list(debug release)) {
         suffix =
-        contains(QT_CONFIG, debug_and_release) {
+        qtConfig(debug_and_release) {
             equals(build, debug): \
                 suffix = _debug
         } else {

mkspecs/features/uikit/default_pre.prf

@@ -2,7 +2,7 @@
 load(default_pre)
 
 # In case Qt was built for a specific SDK
-!contains(QT_CONFIG, simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
+!isEmpty(QT_VERSION):!qtConfig(simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
     CONFIG += simulator $${simulator.sdk}
 
 # Check for supported Xcode versions

mkspecs/features/uikit/sdk.prf

@@ -1,7 +1,7 @@
 
 # In case the user sets the SDK manually
 contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) {
-    contains(QT_CONFIG, simulator_and_device): \
+    qtConfig(simulator_and_device): \
         error("Simulator is handled automatically for simulator_and_device")
 
     CONFIG += simulator $${simulator.sdk}

mkspecs/features/unix/opengl.prf

@@ -1,4 +1,4 @@
-contains(QT_CONFIG, opengles2) {
+qtConfig(opengles2) {
     INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
     !isEmpty(QMAKE_LIBDIR_OPENGL_ES2):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2
     target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES2

mkspecs/features/unix/openvg.prf

@@ -2,13 +2,13 @@
 !isEmpty(QMAKE_LIBDIR_OPENVG): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENVG
 !isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
 
-contains(QT_CONFIG, egl) {
+qtConfig(egl) {
     !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
     !isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL
     !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
 }
 
-contains(QT_CONFIG, openvg_on_opengl) {
+qtConfig(openvg_on_opengl) {
     !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
     !isEmpty(QMAKE_LIBDIR_OPENGL): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENGL
     !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL

mkspecs/features/win32/opengl.prf

@@ -1,9 +1,9 @@
-contains(QT_CONFIG, opengles2) {
+qtConfig(opengles2) {
 #   For Desktop, use the ANGLE library location passed on from configure.
     INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
     CONFIG(debug, debug|release) {
         QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG
-        contains(QT_CONFIG, angle) {
+        qtConfig(angle) {
             LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
         } else {
             LIBS += $$QMAKE_LIBS_OPENGL_ES2
@@ -13,9 +13,9 @@ contains(QT_CONFIG, opengles2) {
         QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE
     }
     DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE
-    contains(QT_CONFIG, static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI=
+    qtConfig(static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI=
 } else {
-    !contains(QT_CONFIG, dynamicgl) {
+    !qtConfig(dynamicgl) {
         QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
         QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
     }

mkspecs/features/win32/openvg.prf

@@ -1,7 +1,7 @@
 QMAKE_LIBS += $$QMAKE_LIBS_OPENVG
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENVG
 
-contains(QT_CONFIG, openvg_on_opengl) {
+qtConfig(openvg_on_opengl) {
     QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
 }

mkspecs/qnx-aarch64le-qcc/qmake.conf

@@ -8,7 +8,7 @@ QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
 
 include(../common/qcc-base-qnx-aarch64le.conf)
 
-contains(QT_CONFIG, stack-protector-strong) {
+qtConfig(stack-protector-strong) {
     QMAKE_CFLAGS += -fstack-protector-strong
     QMAKE_CXXFLAGS += -fstack-protector-strong
 } else {

mkspecs/qnx-x86-64-qcc/qmake.conf

@@ -8,7 +8,7 @@ QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
 
 include(../common/qcc-base-qnx-x86-64.conf)
 
-contains(QT_CONFIG, stack-protector-strong) {
+qtConfig(stack-protector-strong) {
     QMAKE_CFLAGS += -fstack-protector-strong
     QMAKE_CXXFLAGS += -fstack-protector-strong
 } else {

src/3rdparty/freetype_dependency.pri

@@ -1,7 +1,7 @@
-contains(QT_CONFIG, system-freetype) {
+qtConfig(system-freetype) {
     # pull in the proper freetype2 include directory
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-} else: contains(QT_CONFIG, freetype) {
+} else: qtConfig(freetype) {
     INCLUDEPATH += $$PWD/freetype/include
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix()
 }

src/3rdparty/harfbuzz_dependency.pri

@@ -1,6 +1,6 @@
-contains(QT_CONFIG, system-harfbuzz) {
+qtConfig(system-harfbuzz) {
     QMAKE_USE_PRIVATE += harfbuzz
-} else: contains(QT_CONFIG, harfbuzz) {
+} else: qtConfig(harfbuzz) {
     INCLUDEPATH += $$PWD/harfbuzz-ng/include
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
 }

src/3rdparty/png_dependency.pri

@@ -1,6 +1,6 @@
-contains(QT_CONFIG, system-png) {
+qtConfig(system-png) {
     QMAKE_USE_PRIVATE += libpng
-} else: contains(QT_CONFIG, png) {
+} else: qtConfig(png) {
     INCLUDEPATH += $$PWD/libpng
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpng$$qtPlatformTargetSuffix()
 }

src/3rdparty/sqlite.pri

@@ -1,7 +1,7 @@
 CONFIG(release, debug|release):DEFINES *= NDEBUG
 DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
 !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
-contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1
+qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1
 winrt: DEFINES += SQLITE_OS_WINRT
 winphone: DEFINES += SQLITE_WIN32_FILEMAPPING_API=1
 qnx: DEFINES += _QNX_SOURCE

src/3rdparty/zlib_dependency.pri

@@ -1,5 +1,5 @@
 # zlib dependency satisfied by bundled 3rd party zlib or system zlib
-contains(QT_CONFIG, system-zlib) {
+qtConfig(system-zlib) {
     QMAKE_USE_PRIVATE += zlib
 } else {
     INCLUDEPATH +=  $$PWD/zlib

src/angle/src/common/common.pri

@@ -1,5 +1,5 @@
 # static builds should still link ANGLE dynamically when dynamic GL is enabled
-static:contains(QT_CONFIG, dynamicgl) {
+static:qtConfig(dynamicgl) {
     CONFIG -= static
     CONFIG += shared
 }

src/angle/src/compiler/preprocessor/preprocessor.pro

@@ -1,5 +1,5 @@
 CONFIG += static
-contains(QT_CONFIG, dynamicgl): CONFIG += not_installed
+qtConfig(dynamicgl): CONFIG += not_installed
 include(../../config.pri)
 
 INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor

src/angle/src/compiler/translator.pro

@@ -1,5 +1,5 @@
 CONFIG += static
-contains(QT_CONFIG, dynamicgl): CONFIG += not_installed
+qtConfig(dynamicgl): CONFIG += not_installed
 include(../config.pri)
 
 INCLUDEPATH += \

src/concurrent/concurrent.pro

@@ -37,7 +37,7 @@ HEADERS += \
 # private headers
 HEADERS += \
 
-contains(QT_CONFIG, clock-gettime) {
+qtConfig(clock-gettime) {
     linux-*|hpux-*|solaris-*: LIBS_PRIVATE *= -lrt
 }
 

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
 

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

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
             }
         }

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
         }

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
+    qtConfig(poll_select): SOURCES += kernel/qpoll.cpp
-    contains(QT_CONFIG, poll_poll): DEFINES += QT_HAVE_POLL
+    qtConfig(poll_poll): DEFINES += QT_HAVE_POLL
-    contains(QT_CONFIG, poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL
+    qtConfig(poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL
-    contains(QT_CONFIG, poll_pollts): DEFINES += QT_HAVE_POLL QT_HAVE_POLLTS
+    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 \

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)
 }
 

src/dbus/dbus.pro

@@ -4,7 +4,7 @@ MODULE_CONFIG = dbusadaptors dbusinterfaces
 
 DEFINES += DBUS_API_SUBJECT_TO_CHANGE
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS
-contains(QT_CONFIG, dbus-linked) {
+qtConfig(dbus-linked) {
     QMAKE_USE_PRIVATE += dbus
     DEFINES += QT_LINKED_LIBDBUS
 }

src/gui/accessible/accessible.pri

@@ -1,6 +1,6 @@
 # Qt accessibility module
 
-contains(QT_CONFIG, accessibility) {
+qtConfig(accessibility) {
     HEADERS += \
         accessible/qaccessible.h \
         accessible/qaccessiblecache_p.h \

src/gui/gui.pro

@@ -1,7 +1,7 @@
 TARGET     = QtGui
 QT = core-private
 
-contains(QT_CONFIG, opengl.*): MODULE_CONFIG = opengl
+qtConfig(opengl.*): MODULE_CONFIG = opengl
 
 DEFINES   += QT_NO_USING_NAMESPACE
 
@@ -18,7 +18,7 @@ MODULE_PLUGIN_TYPES = \
     egldeviceintegrations
 
 # This is here only because the platform plugin is no module, obviously.
-contains(QT_CONFIG, angle) {
+qtConfig(angle) {
     MODULE_AUX_INCLUDES = \
         \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
 }
@@ -53,7 +53,7 @@ load(cmake_functions)
 
 win32: CMAKE_WINDOWS_BUILD = True
 
-contains(QT_CONFIG, angle) {
+qtConfig(angle) {
     CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
     CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
     CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
@@ -66,22 +66,22 @@ contains(QT_CONFIG, angle) {
 
     CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
 } else {
-    contains(QT_CONFIG, egl) {
+    qtConfig(egl) {
         CMAKE_EGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_EGL)
         !isEmpty(QMAKE_LIBDIR_EGL): CMAKE_EGL_LIBDIR += $$cmakeTargetPath($$QMAKE_LIBDIR_EGL)
     }
 
-    contains(QT_CONFIG, opengles2) {
+    qtConfig(opengles2) {
         !isEmpty(QMAKE_INCDIR_OPENGL_ES2): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)
         CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)
         CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)
         !isEmpty(QMAKE_LIBDIR_OPENGL_ES2): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)
         CMAKE_GL_HEADER_NAME = GLES2/gl2.h
         CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
-    } else:contains(QT_CONFIG, opengl) {
+    } else: qtConfig(opengl) {
         !isEmpty(QMAKE_INCDIR_OPENGL): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)
         CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)
-        !contains(QT_CONFIG, dynamicgl): CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)
+        !qtConfig(dynamicgl): CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)
         !isEmpty(QMAKE_LIBDIR_OPENGL): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)
         CMAKE_GL_HEADER_NAME = GL/gl.h
         mac: CMAKE_GL_HEADER_NAME = gl.h
@@ -89,6 +89,6 @@ contains(QT_CONFIG, angle) {
     }
 }
 
-contains(QT_CONFIG, egl): CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL)
+qtConfig(egl): CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL)
 
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist

src/gui/image/image.pri

@@ -71,7 +71,7 @@ SOURCES += \
         image/qxbmhandler.cpp \
         image/qxpmhandler.cpp
 
-contains(QT_CONFIG, png) {
+qtConfig(png) {
     HEADERS += image/qpnghandler_p.h
     SOURCES += image/qpnghandler.cpp
     include($$PWD/../../3rdparty/png_dependency.pri)

src/gui/kernel/kernel.pri

@@ -139,7 +139,7 @@ SOURCES += \
         kernel/qhighdpiscaling.cpp
 
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
+qtConfig(opengl(es2)?) {
     HEADERS += \
             kernel/qplatformopenglcontext.h \
             kernel/qopenglcontext.h \

src/gui/opengl/opengl.pri

@@ -1,9 +1,9 @@
 # Qt gui library, opengl module
 
-contains(QT_CONFIG, opengl):CONFIG += opengl
+qtConfig(opengl): CONFIG += opengl
-contains(QT_CONFIG, opengles2):CONFIG += opengles2
+qtConfig(opengles2): CONFIG += opengles2
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
+qtConfig(opengl(es2)?) {
 
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
@@ -63,7 +63,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
                opengl/qopengltexturehelper.cpp \
                opengl/qopenglpixeltransferoptions.cpp
 
-    !contains(QT_CONFIG, opengles2) {
+    !qtConfig(opengles2) {
         HEADERS += opengl/qopenglfunctions_1_0.h \
                    opengl/qopenglfunctions_1_1.h \
                    opengl/qopenglfunctions_1_2.h \
@@ -122,7 +122,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
                    opengl/qopengltimerquery.cpp
     }
 
-    contains(QT_CONFIG, opengles2) {
+    qtConfig(opengles2) {
         HEADERS += opengl/qopenglfunctions_es2.h
 
         SOURCES += opengl/qopenglfunctions_es2.cpp

src/gui/text/text.pri

@@ -85,7 +85,7 @@ SOURCES += \
 HEADERS += \
     text/qplatformfontdatabase.h
 
-contains(QT_CONFIG, harfbuzz)|contains(QT_CONFIG, system-harfbuzz) {
+qtConfig(harfbuzz)|qtConfig(system-harfbuzz) {
     DEFINES += QT_ENABLE_HARFBUZZ_NG
 
     include($$PWD/../../3rdparty/harfbuzz_dependency.pri)

src/network/kernel/kernel.pri

@@ -62,7 +62,7 @@ mac {
 
 osx:SOURCES += kernel/qnetworkproxy_mac.cpp
 else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
-else:contains(QT_CONFIG, libproxy) {
+else: qtConfig(libproxy) {
     SOURCES += kernel/qnetworkproxy_libproxy.cpp
     QMAKE_USE_PRIVATE += libproxy
 }

src/network/socket/socket.pri

@@ -27,7 +27,7 @@ SOURCES += socket/qabstractsocketengine.cpp \
 
 # SCTP support.
 
-contains(QT_CONFIG, sctp) {
+qtConfig(sctp) {
     HEADERS += socket/qsctpserver.h \
                 socket/qsctpserver_p.h \
                 socket/qsctpsocket.h \
@@ -80,6 +80,6 @@ integrity: {
     DEFINES += QT_LOCALSOCKET_TCP
 }
 
-contains(QT_CONFIG, system-proxies) {
+qtConfig(system-proxies) {
     DEFINES += QT_USE_SYSTEM_PROXIES
 }

src/network/ssl/ssl.pri

@@ -1,5 +1,5 @@
 # OpenSSL support; compile in QSslSocket.
-contains(QT_CONFIG, ssl) {
+qtConfig(ssl) {
     HEADERS += ssl/qasn1element_p.h \
                ssl/qssl.h \
                ssl/qssl_p.h \
@@ -45,7 +45,7 @@ contains(QT_CONFIG, ssl) {
                    ssl/qsslellipticcurve_dummy.cpp
     }
 
-    contains(QT_CONFIG, securetransport) {
+    qtConfig(securetransport) {
         HEADERS += ssl/qsslsocket_mac_p.h
         SOURCES += ssl/qsslcertificate_qt.cpp \
                    ssl/qssldiffiehellmanparameters_dummy.cpp \
@@ -56,7 +56,7 @@ contains(QT_CONFIG, ssl) {
                    ssl/qsslellipticcurve_dummy.cpp
     }
 
-    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+    qtConfig(openssl)|qtConfig(openssl-linked) {
         HEADERS += ssl/qsslcontext_openssl_p.h \
                    ssl/qsslsocket_openssl_p.h \
                    ssl/qsslsocket_openssl_symbols_p.h

src/opengl/opengl.pro

@@ -9,8 +9,8 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
 QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
 
-contains(QT_CONFIG, opengl):CONFIG += opengl
+qtConfig(opengl): CONFIG += opengl
-contains(QT_CONFIG, opengles2):CONFIG += opengles2
+qtConfig(opengles2): CONFIG += opengles2
 
 HEADERS += qgl.h \
            qgl_p.h \

src/openglextensions/openglextensions.pro

@@ -1,8 +1,8 @@
 TARGET     = QtOpenGLExtensions
 CONFIG += static
 
-contains(QT_CONFIG, opengl):CONFIG += opengl
+qtConfig(opengl): CONFIG += opengl
-contains(QT_CONFIG, opengles2):CONFIG += opengles2
+qtConfig(opengles2): CONFIG += opengles2
 
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
 

src/platformsupport/accessibility/accessibility.pri

@@ -1,4 +1,4 @@
-contains(QT_CONFIG, accessibility) {
+qtConfig(accessibility) {
     INCLUDEPATH += $$PWD
 
     HEADERS += \

src/platformsupport/devicediscovery/devicediscovery.pri

@@ -1,10 +1,10 @@
 HEADERS += $$PWD/qdevicediscovery_p.h
 
-contains(QT_CONFIG, libudev) {
+qtConfig(libudev) {
     SOURCES += $$PWD/qdevicediscovery_udev.cpp
     HEADERS += $$PWD/qdevicediscovery_udev_p.h
     QMAKE_USE_PRIVATE += libudev
-} else: contains(QT_CONFIG, evdev) {
+} else: qtConfig(evdev) {
     SOURCES += $$PWD/qdevicediscovery_static.cpp
     HEADERS += $$PWD/qdevicediscovery_static_p.h
 } else {

src/platformsupport/eglconvenience/eglconvenience.pri

@@ -1,4 +1,4 @@
-contains(QT_CONFIG,egl) {
+qtConfig(egl) {
     HEADERS += \
         $$PWD/qeglconvenience_p.h \
         $$PWD/qeglstreamconvenience_p.h \
@@ -8,7 +8,7 @@ contains(QT_CONFIG,egl) {
         $$PWD/qeglconvenience.cpp \
         $$PWD/qeglstreamconvenience.cpp
 
-    contains(QT_CONFIG,opengl) {
+    qtConfig(opengl) {
         HEADERS += $$PWD/qeglplatformcontext_p.h \
                    $$PWD/qeglpbuffer_p.h
 
@@ -19,7 +19,7 @@ contains(QT_CONFIG,egl) {
     # Avoid X11 header collision, use generic EGL native types
     DEFINES += QT_EGL_NO_X11
 
-    contains(QT_CONFIG,xlib) {
+    qtConfig(xlib) {
         HEADERS += \
             $$PWD/qxlibeglintegration_p.h
         SOURCES += \

src/platformsupport/eventdispatchers/eventdispatchers.pri

@@ -14,7 +14,7 @@ HEADERS +=\
     $$PWD/qwindowsguieventdispatcher_p.h
 }
 
-contains(QT_CONFIG, glib) {
+qtConfig(glib) {
     SOURCES +=$$PWD/qeventdispatcher_glib.cpp
     HEADERS +=$$PWD/qeventdispatcher_glib_p.h
     QMAKE_USE_PRIVATE += glib

src/platformsupport/fontdatabases/fontdatabases.pri

@@ -1,11 +1,11 @@
-!win32|contains(QT_CONFIG, freetype):!mac {
+!win32|qtConfig(freetype):!darwin {
     include($$PWD/basic/basic.pri)
 }
 
 unix:!mac {
     CONFIG += qpa/genericunixfontdatabase
     include($$PWD/genericunix/genericunix.pri)
-    contains(QT_CONFIG,fontconfig) {
+    qtConfig(fontconfig) {
         include($$PWD/fontconfig/fontconfig.pri)
     }
 }

src/platformsupport/fontdatabases/mac/coretext.pri

@@ -1,7 +1,7 @@
 HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
 OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
 
-contains(QT_CONFIG, freetype) {
+qtConfig(freetype) {
     include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
     HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
     SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp

src/platformsupport/glxconvenience/glxconvenience.pri

@@ -1,6 +1,6 @@
-contains(QT_CONFIG, xlib) {
+qtConfig(xlib) {
-    contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) {
+    qtConfig(opengl):!qtConfig(opengles2) {
-        contains(QT_CONFIG, xrender): QMAKE_USE_PRIVATE += xrender
+        qtConfig(xrender): QMAKE_USE_PRIVATE += xrender
         LIBS_PRIVATE += $$QMAKE_LIBS_X11
         HEADERS += $$PWD/qglxconvenience_p.h
         SOURCES += $$PWD/qglxconvenience.cpp

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
-}

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
-}
 

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
-}

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
 }

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)
 }

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
-}

src/platformsupport/linuxaccessibility/linuxaccessibility.pri

@@ -1,4 +1,4 @@
-contains(QT_CONFIG, accessibility-atspi-bridge) {
+qtConfig(accessibility-atspi-bridge) {
 
     QT_FOR_PRIVATE += dbus
     include(../../3rdparty/atspi2/atspi2.pri)

src/platformsupport/platformcompositor/platformcompositor.pri

@@ -1,4 +1,4 @@
-contains(QT_CONFIG, opengl) {
+qtConfig(opengl) {
     SOURCES += $$PWD/qopenglcompositor.cpp \
                $$PWD/qopenglcompositorbackingstore.cpp
 

src/platformsupport/platformsupport.pro

@@ -25,7 +25,7 @@ include(platformcompositor/platformcompositor.pri)
 # dbus convenience, but not for darwin: the platform
 # plugins for these platforms do not use dbus and we
 # don't want to create a false dependency.
-!darwin: contains(QT_CONFIG, dbus) {
+!darwin:qtConfig(dbus) {
     include(dbusmenu/dbusmenu.pri)
     include(dbustray/dbustray.pri)
 }

src/plugins/bearer/bearer.pro

@@ -8,7 +8,7 @@ TEMPLATE = subdirs
 #win32:SUBDIRS += nla
 win32:SUBDIRS += generic
 win32:!winrt: SUBDIRS += nativewifi
-mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
+darwin:qtConfig(corewlan): SUBDIRS += corewlan
 mac:SUBDIRS += generic
 android:SUBDIRS += android
 

src/plugins/bearer/corewlan/corewlan.pro

@@ -3,7 +3,7 @@ TARGET = qcorewlanbearer
 QT = core-private network-private
 LIBS += -framework Foundation -framework SystemConfiguration
 
-contains(QT_CONFIG, corewlan) {
+qtConfig(corewlan) {
     LIBS += -framework CoreWLAN -framework Security
 }
 

src/plugins/generic/generic.pro

@@ -2,11 +2,11 @@ TEMPLATE = subdirs
 
 load(qfeatures)
 
-contains(QT_CONFIG, evdev) {
+qtConfig(evdev) {
     SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
 }
 
-contains(QT_CONFIG, tslib) {
+qtConfig(tslib) {
     SUBDIRS += tslib
 }
 
@@ -14,7 +14,7 @@ contains(QT_CONFIG, tslib) {
     SUBDIRS += tuiotouch
 }
 
-contains(QT_CONFIG, libinput) {
+qtConfig(libinput) {
     SUBDIRS += libinput
 }
 

src/plugins/imageformats/imageformats.pro

@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, ico): SUBDIRS += ico
+qtConfig(ico): SUBDIRS += ico
-contains(QT_CONFIG, jpeg): SUBDIRS += jpeg
+qtConfig(jpeg): SUBDIRS += jpeg
-contains(QT_CONFIG, gif): SUBDIRS += gif
+qtConfig(gif): SUBDIRS += gif

src/plugins/imageformats/jpeg/jpeg.pro

@@ -5,7 +5,7 @@ QT += core-private gui-private
 SOURCES += main.cpp qjpeghandler.cpp
 HEADERS += main.h qjpeghandler_p.h
 
-contains(QT_CONFIG, system-jpeg) {
+qtConfig(system-jpeg) {
     QMAKE_USE += libjpeg
 } else {
     include($$PWD/../../../3rdparty/libjpeg.pri)

src/plugins/platforminputcontexts/compose/compose.pro

@@ -12,7 +12,7 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \
            $$PWD/generator/qtablegenerator.h \
 
 # libxkbcommon
-contains(QT_CONFIG, xkbcommon-qt): {
+!qtConfig(xkbcommon-system) {
     include(../../../3rdparty/xkbcommon.pri)
 } else {
     QMAKE_USE += xkbcommon

src/plugins/platforminputcontexts/platforminputcontexts.pro

@@ -4,6 +4,6 @@ qtHaveModule(dbus) {
 !mac:!win32:SUBDIRS += ibus
 }
 
-contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
+qtConfig(xcb): SUBDIRS += compose
 
 

src/plugins/platforms/cocoa/cocoa.pro

@@ -71,7 +71,7 @@ HEADERS += qcocoaintegration.h \
     messages.h \
     qcocoamimetypes.h
 
-contains(QT_CONFIG, opengl.*) {
+qtConfig(opengl.*) {
     OBJECTIVE_SOURCES += qcocoaglcontext.mm
 
     HEADERS += qcocoaglcontext.h

src/plugins/platforms/directfb/directfb.pro

@@ -24,7 +24,7 @@ HEADERS = qdirectfbintegration.h \
     qdirectfbeglhooks.h
 
 # ### port the GL context
-contains(QT_CONFIG, directfb_egl) {
+qtConfig(directfb_egl) {
     HEADERS += qdirectfb_egl.h
     SOURCES += qdirectfb_egl.cpp
     DEFINES += DIRECTFB_GL_EGL

src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro

@@ -1,12 +1,12 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, egl_x11): SUBDIRS += eglfs_x11
+qtConfig(egl_x11): SUBDIRS += eglfs_x11
-contains(QT_CONFIG, eglfs_gbm): SUBDIRS += eglfs_kms_support eglfs_kms
+qtConfig(eglfs_gbm): SUBDIRS += eglfs_kms_support eglfs_kms
-contains(QT_CONFIG, eglfs_egldevice): SUBDIRS += eglfs_kms_support eglfs_kms_egldevice
+qtConfig(eglfs_egldevice): SUBDIRS += eglfs_kms_support eglfs_kms_egldevice
-contains(QT_CONFIG, eglfs_brcm): SUBDIRS += eglfs_brcm
+qtConfig(eglfs_brcm): SUBDIRS += eglfs_brcm
-contains(QT_CONFIG, eglfs_mali): SUBDIRS += eglfs_mali
+qtConfig(eglfs_mali): SUBDIRS += eglfs_mali
-contains(QT_CONFIG, eglfs_viv): SUBDIRS += eglfs_viv
+qtConfig(eglfs_viv): SUBDIRS += eglfs_viv
-contains(QT_CONFIG, eglfs_viv_wl): SUBDIRS += eglfs_viv_wl
+qtConfig(eglfs_viv_wl): SUBDIRS += eglfs_viv_wl
 
 eglfs_kms_egldevice.depends = eglfs_kms_support
 eglfs_kms.depends = eglfs_kms_support

src/plugins/platforms/offscreen/offscreen.pro

@@ -13,7 +13,7 @@ HEADERS =   qoffscreenintegration.h \
 
 OTHER_FILES += offscreen.json
 
-contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2) {
+qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
     SOURCES += qoffscreenintegration_x11.cpp
     HEADERS += qoffscreenintegration_x11.h
     system(echo "Using X11 offscreen integration with GLX")

src/plugins/platforms/platforms.pro

@@ -4,9 +4,9 @@ android: SUBDIRS += android
 
 !android: SUBDIRS += minimal
 
-!android:if(!win32|contains(QT_CONFIG, freetype)): SUBDIRS += offscreen
+!android:if(!win32|qtConfig(freetype)): SUBDIRS += offscreen
 
-contains(QT_CONFIG, xcb) {
+qtConfig(xcb) {
     SUBDIRS += xcb
 }
 
@@ -16,7 +16,7 @@ osx: SUBDIRS += cocoa
 win32:!winrt: SUBDIRS += windows
 winrt: SUBDIRS += winrt
 
-contains(QT_CONFIG, direct2d) {
+qtConfig(direct2d) {
     SUBDIRS += direct2d
 }
 
@@ -24,16 +24,16 @@ qnx {
     SUBDIRS += qnx
 }
 
-contains(QT_CONFIG, eglfs) {
+qtConfig(eglfs) {
     SUBDIRS += eglfs
     SUBDIRS += minimalegl
 }
 
-contains(QT_CONFIG, directfb) {
+qtConfig(directfb) {
     SUBDIRS += directfb
 }
 
-contains(QT_CONFIG, linuxfb): SUBDIRS += linuxfb
+qtConfig(linuxfb): SUBDIRS += linuxfb
 
 unix:!android:!darwin: SUBDIRS += vnc
 
@@ -45,6 +45,6 @@ haiku {
     SUBDIRS += haiku
 }
 
-contains(QT_CONFIG, mirclient): SUBDIRS += mirclient
+qtConfig(mirclient): SUBDIRS += mirclient
 
-contains(QT_CONFIG, integrityfb): SUBDIRS += integrity
+qtConfig(integrityfb): SUBDIRS += integrity

src/plugins/platforms/qnx/qnx.pro

@@ -75,7 +75,7 @@ CONFIG(qqnx_screeneventthread) {
 
 LIBS += -lscreen
 
-contains(QT_CONFIG, opengles2) {
+qtConfig(opengles2) {
     SOURCES += qqnxglcontext.cpp \
                qqnxeglwindow.cpp
 

src/plugins/platforms/windows/windows.pri

@@ -1,7 +1,7 @@
 # Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
 LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
 
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
+qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
 
 mingw: LIBS *= -luuid
 # For the dialog helpers:
@@ -9,8 +9,8 @@ LIBS += -lshlwapi -lshell32 -ladvapi32
 
 DEFINES *= QT_NO_CAST_FROM_ASCII
 
-contains(QT_CONFIG, directwrite) {
+qtConfig(directwrite) {
-    contains(QT_CONFIG, directwrite2): \
+    qtConfig(directwrite2): \
         DEFINES *= QT_USE_DIRECTWRITE2
 
     SOURCES += $$PWD/qwindowsfontenginedirectwrite.cpp
@@ -65,18 +65,18 @@ HEADERS += \
 
 INCLUDEPATH += $$PWD
 
-contains(QT_CONFIG,opengl): HEADERS += $$PWD/qwindowsopenglcontext.h
+qtConfig(opengl): HEADERS += $$PWD/qwindowsopenglcontext.h
 
-contains(QT_CONFIG, opengles2) {
+qtConfig(opengles2) {
     SOURCES += $$PWD/qwindowseglcontext.cpp
     HEADERS += $$PWD/qwindowseglcontext.h
-} else: contains(QT_CONFIG,opengl) {
+} else: qtConfig(opengl) {
     SOURCES += $$PWD/qwindowsglcontext.cpp
     HEADERS += $$PWD/qwindowsglcontext.h
 }
 
 # Dynamic GL needs both WGL and EGL
-contains(QT_CONFIG,dynamicgl) {
+qtConfig(dynamicgl) {
     SOURCES += $$PWD/qwindowseglcontext.cpp
     HEADERS += $$PWD/qwindowseglcontext.h
 }
@@ -111,10 +111,10 @@ contains(QT_CONFIG,dynamicgl) {
 
 RESOURCES += $$PWD/openglblacklists.qrc
 
-contains(QT_CONFIG, freetype) {
+qtConfig(freetype) {
     HEADERS += $$PWD/qwindowsfontdatabase_ft.h
     SOURCES += $$PWD/qwindowsfontdatabase_ft.cpp
-    contains(QT_CONFIG, system-freetype) {
+    qtConfig(system-freetype) {
         include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
     } else {
         DEFINES *= QT_NO_FONTCONFIG
@@ -122,7 +122,7 @@ contains(QT_CONFIG, freetype) {
     }
 }
 
-contains(QT_CONFIG, accessibility):include($$PWD/accessible/accessible.pri)
+qtConfig(accessibility): include($$PWD/accessible/accessible.pri)
 
 DEFINES *= LIBEGL_NAME=$${LIBEGL_NAME}
 DEFINES *= LIBGLESV2_NAME=$${LIBGLESV2_NAME}

src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro

@@ -1,9 +1,9 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, egl): contains(QT_CONFIG, egl_x11): contains(QT_CONFIG, opengl) {
+qtConfig(egl):qtConfig(egl_x11):qtConfig(opengl) {
     SUBDIRS += xcb_egl
 }
 
-contains(QT_CONFIG, xcb-xlib): contains(QT_CONFIG, opengl): !contains(QT_CONFIG, opengles2) {
+qtConfig(xcb-xlib):qtConfig(opengl):!qtConfig(opengles2) {
     SUBDIRS += xcb_glx
 }

src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri

@@ -4,21 +4,21 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/../
 
 # needed by Xcursor ...
-contains(QT_CONFIG, xcb-xlib) {
+qtConfig(xcb-xlib) {
     DEFINES += XCB_USE_XLIB
-    contains(QT_CONFIG, xinput2) {
+    qtConfig(xinput2) {
         DEFINES += XCB_USE_XINPUT2
     }
 }
 
 # build with session management support
-contains(QT_CONFIG, xcb-sm) {
+qtConfig(xcb-sm) {
     DEFINES += XCB_USE_SM
 }
 
 CONFIG += qpa/genericunixfontdatabase
 
-contains(QT_CONFIG, xcb-qt) {
+!qtConfig(system-xcb) {
     DEFINES += XCB_USE_RENDER
     XCB_DIR = $$clean_path($$PWD/../../../../3rdparty/xcb)
     INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
@@ -27,7 +27,7 @@ contains(QT_CONFIG, xcb-qt) {
 } else {
     qtConfig(xkb): QMAKE_USE += xcb_xkb
     # to support custom cursors with depth > 1
-    contains(QT_CONFIG, xcb-render) {
+    qtConfig(xcb-render) {
         DEFINES += XCB_USE_RENDER
     }
     QMAKE_USE += xcb_syslibs

src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro

@@ -4,7 +4,7 @@ include(../gl_integrations_plugin_base.pri)
 
 CONFIG += egl
 
-contains(QT_CONFIG, xcb-xlib): DEFINES += XCB_USE_XLIB
+qtConfig(xcb-xlib): DEFINES += XCB_USE_XLIB
 
 HEADERS += \
     qxcbeglcontext.h \