diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-05 13:35:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:05 +0000 |
| commit | 60985aa42b37217fb4c01ed85bbf6f14410c3491 (patch) | |
| tree | 710cf1c2457a9e0135d3a2cddf3bf17d2a622378 | |
| parent | 792a99438707c78ed96a1b066489f9100c24a922 (diff) | |
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>
192 files changed, 461 insertions, 449 deletions
diff --git a/configure.json b/configure.json index 3ea5d19d61..86bd601d8d 100644 --- a/configure.json +++ b/configure.json @@ -1241,10 +1241,17 @@ "condition": "!config.uikit && !config.integrity", "output": [ "shared", + "publicFeature", "publicQtConfig", - "publicConfig", - { "type": "publicQtConfig", "negative": true, "name": "static" }, - { "type": "publicConfig", "negative": true, "name": "static" } + "publicConfig" + ] + }, + "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": [ - { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" }, - { "type": "privateConfig", "name": "atomic64-libatomic", "condition": "!tests.atomic64" } - ] + "output": [ { "type": "define", "negative": true, "name": "QT_NO_STD_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.dbus", - "output": [ "feature" ] + "condition": "features.accessibility && features.xcb && features.dbus", + "output": [ "privateFeature", "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": [ - "publicQtConfig", - { "type": "publicQtConfig", "name": "xcb-qt", "condition": "!features.system-xcb" }, - { "type": "publicQtConfig", "name": "xcb-plugin" } - ] + "output": [ "privateFeature" ] }, "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", diff --git a/examples/examples.pro b/examples/examples.pro index bcc13704dc..b57d281384 100644 --- a/examples/examples.pro +++ b/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] diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index 3a63ffb5eb..e4fec201d7 100644 --- a/examples/gui/gui.pro +++ b/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 } diff --git a/examples/network/network.pro b/examples/network/network.pro index 6a09acaae8..68200efb18 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -30,9 +30,9 @@ qtHaveModule(widgets) { } - contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient - contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient - contains(QT_CONFIG, sctp):SUBDIRS += multistreamserver multistreamclient + qtConfig(openssl): SUBDIRS += securesocketclient + qtConfig(openssl-linked): SUBDIRS += securesocketclient + qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient } EXAMPLE_FILES = shared diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro index 78fc6b1a63..3f2578bc1f 100644 --- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro +++ b/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") diff --git a/examples/opengl/legacy/grabber/grabber.pro b/examples/opengl/legacy/grabber/grabber.pro index 1db0e23156..88c03f1c5e 100644 --- a/examples/opengl/legacy/grabber/grabber.pro +++ b/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") diff --git a/examples/opengl/legacy/hellogl/hellogl.pro b/examples/opengl/legacy/hellogl/hellogl.pro index c211242fd2..c6e926c245 100644 --- a/examples/opengl/legacy/hellogl/hellogl.pro +++ b/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") diff --git a/examples/opengl/legacy/legacy.pro b/examples/opengl/legacy/legacy.pro index 0a74d50f7f..1398332c11 100644 --- a/examples/opengl/legacy/legacy.pro +++ b/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 \ diff --git a/examples/opengl/legacy/overpainting/overpainting.pro b/examples/opengl/legacy/overpainting/overpainting.pro index cc46f18889..17213a6079 100644 --- a/examples/opengl/legacy/overpainting/overpainting.pro +++ b/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") diff --git a/examples/opengl/legacy/pbuffers/pbuffers.pro b/examples/opengl/legacy/pbuffers/pbuffers.pro index d779a2a2dc..7572ba3583 100644 --- a/examples/opengl/legacy/pbuffers/pbuffers.pro +++ b/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") diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro index 2ba40a6f74..f1baae3931 100644 --- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro +++ b/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") diff --git a/examples/opengl/legacy/samplebuffers/samplebuffers.pro b/examples/opengl/legacy/samplebuffers/samplebuffers.pro index 3719f5039d..aca56f8df8 100644 --- a/examples/opengl/legacy/samplebuffers/samplebuffers.pro +++ b/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") diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 14d22537e8..afdca816b1 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/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 \ diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 06a7ce8071..5a054fe6b2 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/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 } diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index 7d174ca2bc..5fdbe4a5a2 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/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 } diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index c8d119f4e5..362cc6819c 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/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 } diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index cc489b5c16..65a96dd718 100644 --- a/examples/widgets/widgets.pro +++ b/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 diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index 7183ade4df..40e41900e8 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/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 -!contains(QT_CONFIG, egl): CMAKE_GL_DEFINES += -DNO_EGL=True +qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True +!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True CMAKE_MODULE_VERSIONS = CMAKE_MODULES_UNDER_TEST = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 30960e66dd..7bf6b4a716 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/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") diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index 5df99d1acd..4c8c80d101 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/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 diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index f2961f8743..a55ab1928e 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/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 - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release - contains(QT_CONFIG, build_all): CONFIG += build_all + qtConfig(simulator_and_device): CONFIG += simulator_and_device + qtConfig(debug_and_release): CONFIG += debug_and_release + qtConfig(build_all): CONFIG += build_all } CONFIG += relative_qt_rpath # Qt's QML plugins should be relocatable diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf index f2e4016c99..80382da214 100644 --- a/mkspecs/features/qpa/basicunixfontdatabase.prf +++ b/mkspecs/features/qpa/basicunixfontdatabase.prf @@ -1,3 +1,3 @@ -contains(QT_CONFIG, system-freetype) { +qtConfig(system-freetype) { LIBS_PRIVATE += -lfreetype } diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf index b0d81e5571..3680d5ad79 100644 --- a/mkspecs/features/qpa/genericunixfontdatabase.prf +++ b/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 { diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 3146d95ef4..0c5f080ec1 100644 --- a/mkspecs/features/qt.prf +++ b/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) { diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf index 46aca50cc2..90135b00a3 100644 --- a/mkspecs/features/qt_app.prf +++ b/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 } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index c94c603e20..57f1034d28 100644 --- a/mkspecs/features/qt_common.prf +++ b/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++ -contains(QT_CONFIG, c++14): CONFIG += c++14 -contains(QT_CONFIG, c++1z): CONFIG += c++1z +qtConfig(c++11): CONFIG += c++11 strict_c++ +qtConfig(c++14): CONFIG += c++14 +qtConfig(c++1z): CONFIG += c++1z contains(TEMPLATE, .*lib) { # module and plugins - !host_build:contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols - unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions - contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info + !host_build:qtConfig(reduce_exports): CONFIG += hide_symbols + unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions + qtConfig(separate_debug_info): CONFIG += separate_debug_info !isEmpty(_QMAKE_SUPER_CACHE_): \ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 7e6433814b..08c7c9f899 100644 --- a/mkspecs/features/qt_functions.prf +++ b/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) } diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index dc7a5da30e..8890866c64 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/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 -contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release -contains(QT_CONFIG, build_all): CONFIG += build_all +qtConfig(simulator_and_device): CONFIG += simulator_and_device +qtConfig(debug_and_release): CONFIG += debug_and_release +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) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index bce8b89643..90b4c181ee 100644 --- a/mkspecs/features/qt_module.prf +++ b/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 - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release - contains(QT_CONFIG, build_all): CONFIG += build_all + qtConfig(simulator_and_device): CONFIG += simulator_and_device + qtConfig(debug_and_release): CONFIG += debug_and_release + 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 diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index acf0b4a1e8..7f4efef052 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/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)} diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index c4fea60e0f..2179c7ca22 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/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 - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release - contains(QT_CONFIG, build_all): CONFIG += build_all + qtConfig(simulator_and_device): CONFIG += simulator_and_device + qtConfig(debug_and_release): CONFIG += debug_and_release + qtConfig(build_all): CONFIG += build_all } CONFIG += relative_qt_rpath # Qt's plugins should be relocatable diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf index b712a2b58e..816c3b680d 100644 --- a/mkspecs/features/resolve_config.prf +++ b/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 { diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf index ff45c1de0d..9b2ebc19bd 100644 --- a/mkspecs/features/uikit/default_pre.prf +++ b/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 diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index 0ec065e35d..4ec3600450 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/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} diff --git a/mkspecs/features/unix/opengl.prf b/mkspecs/features/unix/opengl.prf index 123c647be2..72b5ac453d 100644 --- a/mkspecs/features/unix/opengl.prf +++ b/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 diff --git a/mkspecs/features/unix/openvg.prf b/mkspecs/features/unix/openvg.prf index 29acec18ff..500dfc50c6 100644 --- a/mkspecs/features/unix/openvg.prf +++ b/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 diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index 67e7e70ad9..c2c4b1ac6c 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/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 } diff --git a/mkspecs/features/win32/openvg.prf b/mkspecs/features/win32/openvg.prf index 0df5b6621a..9d9a49d856 100644 --- a/mkspecs/features/win32/openvg.prf +++ b/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 } diff --git a/mkspecs/qnx-aarch64le-qcc/qmake.conf b/mkspecs/qnx-aarch64le-qcc/qmake.conf index 8e229d360b..6d72bd459e 100644 --- a/mkspecs/qnx-aarch64le-qcc/qmake.conf +++ b/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 { diff --git a/mkspecs/qnx-x86-64-qcc/qmake.conf b/mkspecs/qnx-x86-64-qcc/qmake.conf index f1760e4072..ebedeceb46 100644 --- a/mkspecs/qnx-x86-64-qcc/qmake.conf +++ b/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 { diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index 7513e40bfd..012e4af6c3 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/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() } diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri index f39bb62381..5946f403c5 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/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() } diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri index 12dbfc5487..50711358a0 100644 --- a/src/3rdparty/png_dependency.pri +++ b/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() } diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 29968e323f..87c356870b 100644 --- a/src/3rdparty/sqlite.pri +++ b/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 diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 11ad70621d..6ac7e59158 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/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 diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 9eae06d410..c948e27dc3 100644 --- a/src/angle/src/common/common.pri +++ b/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 } diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index cbf411623d..f9170b3bee 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/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 diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro index d48ac70472..cee13d06bb 100644 --- a/src/angle/src/compiler/translator.pro +++ b/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 += \ diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index fd15a3c758..337f4042bd 100644 --- a/src/concurrent/concurrent.pro +++ b/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 } 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) } diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index f2e066852b..43050dcea2 100644 --- a/src/dbus/dbus.pro +++ b/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 } diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index b7f341d5b7..8dd821fe6a 100644 --- a/src/gui/accessible/accessible.pri +++ b/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 \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index d1d0041616..a6eaadd6c5 100644 --- a/src/gui/gui.pro +++ b/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 diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index fe21ff4cc0..3c4d2c0bbf 100644 --- a/src/gui/image/image.pri +++ b/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) diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 0e224df1ff..3b7e03a0ff 100644 --- a/src/gui/kernel/kernel.pri +++ b/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 \ diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index dfaf3042bc..2fc9a0e964 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -1,9 +1,9 @@ # Qt gui library, opengl module -contains(QT_CONFIG, opengl):CONFIG += opengl -contains(QT_CONFIG, opengles2):CONFIG += opengles2 +qtConfig(opengl): CONFIG += opengl +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 diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index be60ba72cc..3fe47a6645 100644 --- a/src/gui/text/text.pri +++ b/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) diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index c3e546eabc..e1eb4f7a93 100644 --- a/src/network/kernel/kernel.pri +++ b/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 } diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index b1c0b6bd6e..793ea60b07 100644 --- a/src/network/socket/socket.pri +++ b/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 } diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index edbbeadf51..8139af50af 100644 --- a/src/network/ssl/ssl.pri +++ b/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 diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 2386ef5d19..25de6ad670 100644 --- a/src/opengl/opengl.pro +++ b/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 -contains(QT_CONFIG, opengles2):CONFIG += opengles2 +qtConfig(opengl): CONFIG += opengl +qtConfig(opengles2): CONFIG += opengles2 HEADERS += qgl.h \ qgl_p.h \ diff --git a/src/openglextensions/openglextensions.pro b/src/openglextensions/openglextensions.pro index 04a871114b..42ba4152d5 100644 --- a/src/openglextensions/openglextensions.pro +++ b/src/openglextensions/openglextensions.pro @@ -1,8 +1,8 @@ TARGET = QtOpenGLExtensions CONFIG += static -contains(QT_CONFIG, opengl):CONFIG += opengl -contains(QT_CONFIG, opengles2):CONFIG += opengles2 +qtConfig(opengl): CONFIG += opengl +qtConfig(opengles2): CONFIG += opengles2 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH diff --git a/src/platformsupport/accessibility/accessibility.pri b/src/platformsupport/accessibility/accessibility.pri index fb56edbf1a..924f6a512f 100644 --- a/src/platformsupport/accessibility/accessibility.pri +++ b/src/platformsupport/accessibility/accessibility.pri @@ -1,4 +1,4 @@ -contains(QT_CONFIG, accessibility) { +qtConfig(accessibility) { INCLUDEPATH += $$PWD HEADERS += \ diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 4a92c404d4..f4e9103130 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/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 { diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri index 1cacaf4a4c..4a93d997fb 100644 --- a/src/platformsupport/eglconvenience/eglconvenience.pri +++ b/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 += \ diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index 4a562ace99..fb0f3b3827 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/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 diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri index 12b06d64cc..0ef46d0a1c 100644 --- a/src/platformsupport/fontdatabases/fontdatabases.pri +++ b/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) } } diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index 272e7591ba..4140b64b22 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/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 diff --git a/src/platformsupport/glxconvenience/glxconvenience.pri b/src/platformsupport/glxconvenience/glxconvenience.pri index 29aa2f6242..80e79ee663 100644 --- a/src/platformsupport/glxconvenience/glxconvenience.pri +++ b/src/platformsupport/glxconvenience/glxconvenience.pri @@ -1,6 +1,6 @@ -contains(QT_CONFIG, xlib) { - contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) { - contains(QT_CONFIG, xrender): QMAKE_USE_PRIVATE += xrender +qtConfig(xlib) { + qtConfig(opengl):!qtConfig(opengles2) { + qtConfig(xrender): QMAKE_USE_PRIVATE += xrender LIBS_PRIVATE += $$QMAKE_LIBS_X11 HEADERS += $$PWD/qglxconvenience_p.h SOURCES += $$PWD/qglxconvenience.cpp 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 -} diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri index 1b65fb1cad..1f36b815cf 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri +++ b/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) diff --git a/src/platformsupport/platformcompositor/platformcompositor.pri b/src/platformsupport/platformcompositor/platformcompositor.pri index 923d7225da..1e908c9998 100644 --- a/src/platformsupport/platformcompositor/platformcompositor.pri +++ b/src/platformsupport/platformcompositor/platformcompositor.pri @@ -1,4 +1,4 @@ -contains(QT_CONFIG, opengl) { +qtConfig(opengl) { SOURCES += $$PWD/qopenglcompositor.cpp \ $$PWD/qopenglcompositorbackingstore.cpp diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 9f6f3380e1..0f1d709997 100644 --- a/src/platformsupport/platformsupport.pro +++ b/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) } diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 8028e65147..8078a5708c 100644 --- a/src/plugins/bearer/bearer.pro +++ b/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 diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index ab0257aecd..1dc09ebdd6 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/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 } diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro index 182a60fdb5..c0a81d4dc8 100644 --- a/src/plugins/generic/generic.pro +++ b/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 } diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index f3ed37b722..d2588c1b18 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -contains(QT_CONFIG, ico): SUBDIRS += ico -contains(QT_CONFIG, jpeg): SUBDIRS += jpeg -contains(QT_CONFIG, gif): SUBDIRS += gif +qtConfig(ico): SUBDIRS += ico +qtConfig(jpeg): SUBDIRS += jpeg +qtConfig(gif): SUBDIRS += gif diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index 3cbf60ec8a..89476e62f5 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/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) diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 43ddf0d00b..17284874f6 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/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 diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro index faea54b874..f22b8b69db 100644 --- a/src/plugins/platforminputcontexts/platforminputcontexts.pro +++ b/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 diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 02d8b16110..d9d3cb1627 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/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 diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index d4977bf40f..de0344ff5c 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/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 diff --git a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro index 769c248d0d..b46b04d149 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro @@ -1,12 +1,12 @@ TEMPLATE = subdirs -contains(QT_CONFIG, egl_x11): SUBDIRS += eglfs_x11 -contains(QT_CONFIG, eglfs_gbm): SUBDIRS += eglfs_kms_support eglfs_kms -contains(QT_CONFIG, eglfs_egldevice): SUBDIRS += eglfs_kms_support eglfs_kms_egldevice -contains(QT_CONFIG, eglfs_brcm): SUBDIRS += eglfs_brcm -contains(QT_CONFIG, eglfs_mali): SUBDIRS += eglfs_mali -contains(QT_CONFIG, eglfs_viv): SUBDIRS += eglfs_viv -contains(QT_CONFIG, eglfs_viv_wl): SUBDIRS += eglfs_viv_wl +qtConfig(egl_x11): SUBDIRS += eglfs_x11 +qtConfig(eglfs_gbm): SUBDIRS += eglfs_kms_support eglfs_kms +qtConfig(eglfs_egldevice): SUBDIRS += eglfs_kms_support eglfs_kms_egldevice +qtConfig(eglfs_brcm): SUBDIRS += eglfs_brcm +qtConfig(eglfs_mali): SUBDIRS += eglfs_mali +qtConfig(eglfs_viv): SUBDIRS += eglfs_viv +qtConfig(eglfs_viv_wl): SUBDIRS += eglfs_viv_wl eglfs_kms_egldevice.depends = eglfs_kms_support eglfs_kms.depends = eglfs_kms_support diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 999550a7e1..cc65449b04 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/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") diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 4bed5312ec..8324520725 100644 --- a/src/plugins/platforms/platforms.pro +++ b/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 diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index 51ffa5624f..e47731476f 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/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 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 1cadcd1954..28d7d04db4 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/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) { - contains(QT_CONFIG, directwrite2): \ +qtConfig(directwrite) { + 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} diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro index 9de0476810..0cdee03f62 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro +++ b/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 } diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri index e97f24e974..57c8f27d9c 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri +++ b/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 diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro index 6d52332bad..92e6c18fbe 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro +++ b/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 \ diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro index adac4b2e22..88c4144fd9 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro @@ -5,7 +5,7 @@ include(../gl_integrations_plugin_base.pri) #should be removed from the sources DEFINES += XCB_USE_GLX XCB_USE_XLIB -contains(QT_CONFIG, xcb-glx) { +qtConfig(xcb-glx) { DEFINES += XCB_HAS_XCB_GLX QMAKE_USE += xcb_glx } diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 5915a59c0b..7840a4583f 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs CONFIG += ordered -contains(QT_CONFIG, xcb-qt):SUBDIRS+=xcb-static +!qtConfig(system-xcb): SUBDIRS += xcb-static SUBDIRS += xcb_qpa_lib.pro SUBDIRS += xcb-plugin.pro diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index f995249c0d..0d5f0ca001 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -40,11 +40,11 @@ HEADERS = \ DEFINES += QT_BUILD_XCB_PLUGIN # needed by Xcursor ... -contains(QT_CONFIG, xcb-xlib) { +qtConfig(xcb-xlib) { DEFINES += XCB_USE_XLIB QMAKE_USE += xcb_xlib - contains(QT_CONFIG, xinput2) { + qtConfig(xinput2) { DEFINES += XCB_USE_XINPUT2 SOURCES += qxcbconnection_xi2.cpp QMAKE_USE += xinput2 @@ -52,7 +52,7 @@ contains(QT_CONFIG, xcb-xlib) { } # build with session management support -contains(QT_CONFIG, xcb-sm) { +qtConfig(xcb-sm) { DEFINES += XCB_USE_SM QMAKE_USE += x11sm SOURCES += qxcbsessionmanager.cpp @@ -63,11 +63,10 @@ include(gl_integrations/gl_integrations.pri) CONFIG += qpa/genericunixfontdatabase -contains(QT_CONFIG, dbus-linked) { +qtConfig(dbus-linked): \ QT += dbus -} -contains(QT_CONFIG, xcb-qt) { +!qtConfig(system-xcb) { DEFINES += XCB_USE_RENDER XCB_DIR = ../../../3rdparty/xcb INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude @@ -77,7 +76,7 @@ contains(QT_CONFIG, xcb-qt) { LIBS += -lxcb-xinerama ### there is no configure test for this! 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_render } @@ -85,7 +84,7 @@ contains(QT_CONFIG, xcb-qt) { } # libxkbcommon -contains(QT_CONFIG, xkbcommon-qt) { +!qtConfig(xkbcommon-system) { include(../../../3rdparty/xkbcommon-x11.pri) } else { QMAKE_USE += xkbcommon diff --git a/src/plugins/platformthemes/platformthemes.pro b/src/plugins/platformthemes/platformthemes.pro index f5f54068a2..166b39ce8c 100644 --- a/src/plugins/platformthemes/platformthemes.pro +++ b/src/plugins/platformthemes/platformthemes.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -contains(QT_CONFIG, gtk3): SUBDIRS += gtk3 +qtConfig(gtk3): SUBDIRS += gtk3 diff --git a/src/plugins/printsupport/printsupport.pro b/src/plugins/printsupport/printsupport.pro index bd6681f53c..55feaba40c 100644 --- a/src/plugins/printsupport/printsupport.pro +++ b/src/plugins/printsupport/printsupport.pro @@ -1,8 +1,6 @@ +QT += printsupport TEMPLATE = subdirs osx: SUBDIRS += cocoa win32: SUBDIRS += windows -unix:!mac:contains(QT_CONFIG, cups) { - load(qfeatures) - !contains(QT_DISABLED_FEATURES, cups): SUBDIRS += cups -} +unix:!darwin:qtConfig(cups): SUBDIRS += cups diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index bf95d9e8f6..22d12e4cc3 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -33,7 +33,7 @@ win32 { LIBS_PRIVATE += -lwinspool -lcomdlg32 -lgdi32 -luser32 } -unix:!mac:contains(QT_CONFIG, cups): { +unix:!darwin:qtConfig(cups) { SOURCES += $$PWD/qcups.cpp HEADERS += $$PWD/qcups_p.h } diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri index 8e5cb12a6d..8a98da1718 100644 --- a/src/printsupport/widgets/widgets.pri +++ b/src/printsupport/widgets/widgets.pri @@ -1,7 +1,7 @@ HEADERS += widgets/qprintpreviewwidget.h SOURCES += widgets/qprintpreviewwidget.cpp -unix:!mac:contains(QT_CONFIG, cups): { +unix:!darwin:qtConfig(cups) { HEADERS += widgets/qcupsjobwidget_p.h SOURCES += widgets/qcupsjobwidget.cpp FORMS += widgets/qcupsjobwidget.ui diff --git a/src/src.pro b/src/src.pro index c4da871abe..ec656e483c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,7 +1,5 @@ TEMPLATE = subdirs -load(qfeatures) - src_qtzlib.file = $$PWD/corelib/qtzlib.pro src_qtzlib.target = sub-zlib @@ -132,9 +130,9 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important -!contains(QT_CONFIG, system-zlib)|cross_compile { +!qtConfig(system-zlib)|cross_compile { SUBDIRS += src_qtzlib - !contains(QT_CONFIG, system-zlib) { + !qtConfig(system-zlib) { src_3rdparty_libpng.depends += src_corelib src_3rdparty_freetype.depends += src_corelib } @@ -148,44 +146,44 @@ SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain SUBDIRS += src_network src_sql src_xml src_testlib -contains(QT_CONFIG, dbus) { - force_bootstrap|contains(QT_CONFIG, private_tests): \ +qtConfig(dbus) { + force_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus SUBDIRS += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - contains(QT_CONFIG, accessibility-atspi-bridge): \ + qtConfig(accessibility-atspi-bridge): \ src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml } -contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent -!contains(QT_CONFIG, no-gui) { - contains(QT_CONFIG, harfbuzz):!contains(QT_CONFIG, system-harfbuzz) { +qtConfig(concurrent): SUBDIRS += src_concurrent +qtConfig(gui) { + qtConfig(harfbuzz):!qtConfig(system-harfbuzz) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } - contains(QT_CONFIG, angle) { + qtConfig(angle) { SUBDIRS += src_angle src_gui.depends += src_angle } - contains(QT_CONFIG, png) { + qtConfig(png) { SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng src_gui.depends += src_3rdparty_libpng } - contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) { + qtConfig(freetype):!qtConfig(system-freetype) { SUBDIRS += src_3rdparty_freetype src_platformsupport.depends += src_3rdparty_freetype } SUBDIRS += src_gui src_platformsupport src_platformheaders - contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions + qtConfig(opengl(es2)?): SUBDIRS += src_openglextensions src_plugins.depends += src_gui src_platformsupport src_platformheaders src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers - !contains(QT_CONFIG, no-widgets) { + qtConfig(widgets) { SUBDIRS += src_tools_uic src_widgets TOOLS += src_tools_uic src_plugins.depends += src_widgets src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - contains(QT_CONFIG, opengl(es2)?) { + qtConfig(opengl(es2)?) { SUBDIRS += src_opengl src_plugins.depends += src_opengl } diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index b5015ed562..d544288031 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -138,7 +138,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -!contains(QT_CONFIG, system-zlib)|cross_compile { +!qtConfig(system-zlib)|cross_compile { include(../../3rdparty/zlib.pri) } else { CONFIG += no_core_dep diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri index ac8205b1e3..e63ae28d30 100644 --- a/src/widgets/accessible/accessible.pri +++ b/src/widgets/accessible/accessible.pri @@ -1,6 +1,6 @@ # Qt accessibility module -contains(QT_CONFIG, accessibility) { +qtConfig(accessibility) { HEADERS += \ accessible/qaccessiblewidget.h \ accessible/qaccessiblewidgetfactory_p.h \ diff --git a/src/widgets/accessible/widgets.pro b/src/widgets/accessible/widgets.pro index da8607c637..d04d0da3cc 100644 --- a/src/widgets/accessible/widgets.pro +++ b/src/widgets/accessible/widgets.pro @@ -2,7 +2,7 @@ TARGET = qtaccessiblewidgets QT += core-private gui-private widgets-private -QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" +QTDIR_build:REQUIRES += "qtConfig(accessibility)" SOURCES += main.cpp \ simplewidgets.cpp \ diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index b40a33b2af..ad2180bbfd 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -80,7 +80,7 @@ wince { kernel/qwidgetsfunctions_wince.cpp } -contains(QT_CONFIG, opengl) { +qtConfig(opengl) { HEADERS += kernel/qopenglwidget.h SOURCES += kernel/qopenglwidget.cpp } diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index 700831771d..cb19c1fc95 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -29,7 +29,7 @@ SOURCES += \ win32:!winrt { SOURCES += util/qsystemtrayicon_win.cpp -} else:contains(QT_CONFIG, xcb) { +} else: qtConfig(xcb) { SOURCES += util/qsystemtrayicon_x11.cpp } else { SOURCES += util/qsystemtrayicon_qpa.cpp diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 2bb7529456..4140ae48de 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -10,7 +10,7 @@ QT = core DEFINES += QT_NO_FOREACH -contains(QT_CONFIG, debug_and_release): CONFIG += build_all +qtConfig(debug_and_release): CONFIG += build_all win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8a3c39e9b1..cadd97fb3a 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -34,7 +34,7 @@ cross_compile: SUBDIRS -= tools cmake installed_cma # Disable the QtDBus tests if we can't connect to the session bus !cross_compile:qtHaveModule(dbus) { !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") { - contains(QT_CONFIG, dbus-linked): \ + qtConfig(dbus-linked): \ error("QtDBus is enabled but session bus is not available. Please check the installation.") else: \ warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.") diff --git a/tests/auto/corelib/global/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro index 29dfb0684c..c3c11fa81b 100644 --- a/tests/auto/corelib/global/qflags/qflags.pro +++ b/tests/auto/corelib/global/qflags/qflags.pro @@ -2,5 +2,5 @@ CONFIG += testcase TARGET = tst_qflags QT = core testlib SOURCES = tst_qflags.cpp -contains(QT_CONFIG, c++11): CONFIG += c++11 -contains(QT_CONFIG, c++14): CONFIG += c++14 +qtConfig(c++11): CONFIG += c++11 +qtConfig(c++14): CONFIG += c++14 diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro index b5b75be3a6..93eee7307a 100644 --- a/tests/auto/corelib/global/qlogging/test/test.pro +++ b/tests/auto/corelib/global/qlogging/test/test.pro @@ -1,7 +1,7 @@ CONFIG += testcase CONFIG -= app_bundle debug_and_release_target -contains(QT_CONFIG, c++11): CONFIG += c++11 -contains(QT_CONFIG, c++14): CONFIG += c++14 +qtConfig(c++11): CONFIG += c++11 +qtConfig(c++14): CONFIG += c++14 TARGET = ../tst_qlogging QT = core testlib SOURCES = ../tst_qlogging.cpp diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 24c762ed84..0542833456 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -49,14 +49,14 @@ SUBDIRS=\ qprocess \ qtextstream -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qabstractfileengine \ qfileinfo \ qipaddress \ qurlinternal \ qloggingregistry -win32:!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +win32:!qtConfig(private_tests): SUBDIRS -= \ qfilesystementry winrt: SUBDIRS -= \ diff --git a/tests/auto/corelib/io/qurlinternal/qurlinternal.pro b/tests/auto/corelib/io/qurlinternal/qurlinternal.pro index ae5e023446..3828512dce 100644 --- a/tests/auto/corelib/io/qurlinternal/qurlinternal.pro +++ b/tests/auto/corelib/io/qurlinternal/qurlinternal.pro @@ -1,5 +1,5 @@ CONFIG += testcase -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) TARGET = tst_qurlinternal SOURCES += tst_qurlinternal.cpp ../../codecs/utf8/utf8data.cpp QT = core core-private testlib diff --git a/tests/auto/corelib/json/json.pro b/tests/auto/corelib/json/json.pro index b3038d7ca1..dc9cd3e383 100644 --- a/tests/auto/corelib/json/json.pro +++ b/tests/auto/corelib/json/json.pro @@ -6,7 +6,7 @@ CONFIG += testcase !android:TESTDATA += bom.json test.json test.bjson test3.json test2.json else:RESOURCES += json.qrc -!contains(QT_CONFIG, doubleconversion):!contains(QT_CONFIG, system-doubleconversion) { +!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) { DEFINES += QT_NO_DOUBLECONVERSION } diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 97c303fdd6..75b98bcd09 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -33,7 +33,7 @@ SUBDIRS=\ qobject \ qsocketnotifier -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qsocketnotifier \ qsharedmemory diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index a49bb9ae1f..d166351490 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -3,4 +3,4 @@ TARGET = tst_qcoreapplication QT = core testlib core-private SOURCES = tst_qcoreapplication.cpp HEADERS = tst_qcoreapplication.h -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index 50072dc612..295a42aa9c 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -5,4 +5,4 @@ SOURCES = $$PWD/tst_qeventloop.cpp win32:!winrt: LIBS += -luser32 -contains(QT_CONFIG, glib): DEFINES += HAVE_GLIB +qtConfig(glib): DEFINES += HAVE_GLIB diff --git a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index 58e4b98af7..04806de5f7 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -3,6 +3,6 @@ TARGET = tst_qsocketnotifier QT = core-private network-private testlib SOURCES = tst_qsocketnotifier.cpp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) include(../../../network/socket/platformsocketengine/platformsocketengine.pri) diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 33e8b6e2ad..96071f9f73 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -5,7 +5,7 @@ INCLUDEPATH += $$PWD/../../../other/qvariant_common SOURCES = tst_qvariant.cpp RESOURCES += qvariant.qrc DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -contains(QT_CONFIG, c++11): CONFIG += c++11 -!contains(QT_CONFIG, doubleconversion):!contains(QT_CONFIG, system-doubleconversion) { +qtConfig(c++11): CONFIG += c++11 +!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) { DEFINES += QT_NO_DOUBLECONVERSION } diff --git a/tests/auto/corelib/mimetypes/mimetypes.pro b/tests/auto/corelib/mimetypes/mimetypes.pro index 9063d677e7..9dd091374f 100644 --- a/tests/auto/corelib/mimetypes/mimetypes.pro +++ b/tests/auto/corelib/mimetypes/mimetypes.pro @@ -4,5 +4,5 @@ SUBDIRS = \ qmimetype \ qmimedatabase -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qmimetype diff --git a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro index 83d00f7cd8..c681f5585c 100644 --- a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro +++ b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro @@ -5,7 +5,7 @@ SUBDIRS = lib \ theplugin \ tst !android: !win32: !mac: SUBDIRS += almostplugin -macx-*: contains(QT_CONFIG, private_tests): SUBDIRS += machtest +macx-*: qtConfig(private_tests): SUBDIRS += machtest TARGET = tst_qpluginloader # no special install rule for subdir diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro index 101392927c..5f9fa6664b 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro +++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = ../tst_qpluginloader QT = core testlib -contains(QT_CONFIG, private_tests): QT += core-private +qtConfig(private_tests): QT += core-private SOURCES = ../tst_qpluginloader.cpp ../fakeplugin.cpp HEADERS = ../theplugin/plugininterface.h CONFIG -= app_bundle diff --git a/tests/auto/corelib/tools/qcollator/qcollator.pro b/tests/auto/corelib/tools/qcollator/qcollator.pro index ed879ee70e..7725194e3d 100644 --- a/tests/auto/corelib/tools/qcollator/qcollator.pro +++ b/tests/auto/corelib/tools/qcollator/qcollator.pro @@ -3,4 +3,4 @@ TARGET = tst_qcollator QT = core testlib SOURCES = tst_qcollator.cpp DEFINES += QT_NO_CAST_TO_ASCII -contains(QT_CONFIG,icu):DEFINES += QT_USE_ICU +qtConfig(icu): DEFINES += QT_USE_ICU diff --git a/tests/auto/corelib/tools/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro index fb108338bd..4825987bcf 100644 --- a/tests/auto/corelib/tools/qfreelist/qfreelist.pro +++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro @@ -2,4 +2,4 @@ CONFIG += testcase TARGET = tst_qfreelist QT = core-private testlib SOURCES = tst_qfreelist.cpp -!contains(QT_CONFIG,private_tests): SOURCES += $$QT_SOURCE_TREE/src/corelib/tools/qfreelist.cpp +!qtConfig(private_tests): SOURCES += $$QT_SOURCE_TREE/src/corelib/tools/qfreelist.cpp diff --git a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro index a996dab23e..61054b40e4 100644 --- a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro +++ b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro @@ -3,7 +3,7 @@ TARGET = tst_qlatin1string QT = core testlib SOURCES = tst_qlatin1string.cpp DEFINES += QT_NO_CAST_TO_ASCII -contains(QT_CONFIG,c++11): CONFIG += c++11 -contains(QT_CONFIG,c++14): CONFIG += c++14 +qtConfig(c++11): CONFIG += c++11 +qtConfig(c++14): CONFIG += c++14 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro index d9004d1eb6..595ee258e7 100644 --- a/tests/auto/corelib/tools/qlocale/test/test.pro +++ b/tests/auto/corelib/tools/qlocale/test/test.pro @@ -4,7 +4,7 @@ QT = core testlib core-private embedded: QT += gui SOURCES = ../tst_qlocale.cpp -!contains(QT_CONFIG, doubleconversion):!contains(QT_CONFIG, system-doubleconversion) { +!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) { DEFINES += QT_NO_DOUBLECONVERSION } diff --git a/tests/auto/corelib/tools/qregularexpression/qregularexpression.pro b/tests/auto/corelib/tools/qregularexpression/qregularexpression.pro index c030f04a27..e1840808ff 100644 --- a/tests/auto/corelib/tools/qregularexpression/qregularexpression.pro +++ b/tests/auto/corelib/tools/qregularexpression/qregularexpression.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS = defaultoptimize forceoptimize -contains(QT_CONFIG,private_tests):SUBDIRS += alwaysoptimize +qtConfig(private_tests): SUBDIRS += alwaysoptimize diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro index 1ff9a4fc9e..a94ad3405a 100644 --- a/tests/auto/corelib/tools/qstring/qstring.pro +++ b/tests/auto/corelib/tools/qstring/qstring.pro @@ -3,11 +3,11 @@ TARGET = tst_qstring QT = core testlib SOURCES = tst_qstring.cpp DEFINES += QT_NO_CAST_TO_ASCII -contains(QT_CONFIG,icu):DEFINES += QT_USE_ICU -contains(QT_CONFIG,c++11): CONFIG += c++11 +qtConfig(icu): DEFINES += QT_USE_ICU +qtConfig(c++11): CONFIG += c++11 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -!contains(QT_CONFIG, doubleconversion):!contains(QT_CONFIG, system-doubleconversion) { +!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) { DEFINES += QT_NO_DOUBLECONVERSION } diff --git a/tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro b/tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro index 76e89c9acd..bc38b17949 100644 --- a/tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro +++ b/tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro @@ -2,4 +2,4 @@ CONFIG += testcase TARGET = tst_qstringapisymmetry QT = core testlib SOURCES = tst_qstringapisymmetry.cpp -contains(QT_CONFIG,c++14): CONFIG += c++14 +qtConfig(c++14): CONFIG += c++14 diff --git a/tests/auto/corelib/tools/qtimezone/qtimezone.pro b/tests/auto/corelib/tools/qtimezone/qtimezone.pro index 4459ed6020..afc4c59dfe 100644 --- a/tests/auto/corelib/tools/qtimezone/qtimezone.pro +++ b/tests/auto/corelib/tools/qtimezone/qtimezone.pro @@ -2,6 +2,6 @@ CONFIG += testcase TARGET = tst_qtimezone QT = core-private testlib SOURCES = tst_qtimezone.cpp -contains(QT_CONFIG,icu) { +qtConfig(icu) { DEFINES += QT_USE_ICU } diff --git a/tests/auto/corelib/tools/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro index d49516923f..b9a4ae747b 100644 --- a/tests/auto/corelib/tools/qvector/qvector.pro +++ b/tests/auto/corelib/tools/qvector/qvector.pro @@ -1,5 +1,5 @@ CONFIG += testcase -contains(QT_CONFIG, c++11):CONFIG += c++11 +qtConfig(c++11): CONFIG += c++11 TARGET = tst_qvector QT = core testlib SOURCES = $$PWD/tst_qvector.cpp diff --git a/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro b/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro index 834fc85a29..e2ae91cb64 100644 --- a/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro +++ b/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro @@ -1,6 +1,6 @@ CONFIG += testcase -contains(QT_CONFIG, c++11):CONFIG += c++11 -contains(QT_CONFIG, c++14):CONFIG += c++14 +qtConfig(c++11): CONFIG += c++11 +qtConfig(c++14): CONFIG += c++14 TARGET = tst_qversionnumber QT = core testlib SOURCES = tst_qversionnumber.cpp diff --git a/tests/auto/dbus/dbus.pro b/tests/auto/dbus/dbus.pro index c5cddee5f5..1769583fca 100644 --- a/tests/auto/dbus/dbus.pro +++ b/tests/auto/dbus/dbus.pro @@ -26,6 +26,6 @@ SUBDIRS+=\ qdbusthreading \ qdbusxmlparser -!contains(QT_CONFIG,private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qdbusmarshall \ diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro index e9a41c0fb4..caedb5a0f2 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro @@ -6,4 +6,4 @@ SUBDIRS = qpong qdbusmarshall QT = core-private testlib -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro index ed6084b702..031cc252c8 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro @@ -5,7 +5,7 @@ DESTDIR = ./ QT = core-private dbus-private testlib -contains(QT_CONFIG, dbus-linked) { +qtConfig(dbus-linked) { DEFINES += QT_LINKED_LIBDBUS QMAKE_USE += dbus } else { diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index fb0ebd6b1e..75a9980732 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -2,7 +2,7 @@ CONFIG += testcase parallel_test TARGET = tst_qdbustype QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp -contains(QT_CONFIG, dbus-linked) { +qtConfig(dbus-linked) { DEFINES += QT_LINKED_LIBDBUS QMAKE_USE += dbus } else { diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index d6aa5e01ae..8d8a2df393 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -13,4 +13,4 @@ SUBDIRS = \ util \ itemmodels \ -!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= qopengl qopenglconfig +!qtConfig(opengl(es2)?): SUBDIRS -= qopengl qopenglconfig diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro index 9199763c40..5a74df4c78 100644 --- a/tests/auto/gui/image/image.pro +++ b/tests/auto/gui/image/image.pro @@ -14,6 +14,6 @@ SUBDIRS=\ !qtHaveModule(network): SUBDIRS -= \ qimagereader -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qpixmapcache \ diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro index 36d64a275f..39ce4e26cb 100644 --- a/tests/auto/gui/image/qimage/qimage.pro +++ b/tests/auto/gui/image/qimage/qimage.pro @@ -3,7 +3,7 @@ TARGET = tst_qimage SOURCES += tst_qimage.cpp QT += core-private gui-private testlib -contains(QT_CONFIG, c++11): CONFIG += c++11 +qtConfig(c++11): CONFIG += c++11 android: RESOURCES+=qimage.qrc diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro index 4a741ec154..6a7e23be99 100644 --- a/tests/auto/gui/image/qmovie/qmovie.pro +++ b/tests/auto/gui/image/qmovie/qmovie.pro @@ -5,8 +5,8 @@ qtHaveModule(widgets): QT += widgets SOURCES += tst_qmovie.cpp MOC_DIR=tmp -contains(QT_CONFIG, gif):DEFINES += QTEST_HAVE_GIF -contains(QT_CONFIG, jpeg):DEFINES += QTEST_HAVE_JPEG +qtConfig(gif): DEFINES += QTEST_HAVE_GIF +qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG RESOURCES += resources.qrc TESTDATA += animations/* diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro index 62a888d685..631962ad34 100644 --- a/tests/auto/gui/kernel/kernel.pro +++ b/tests/auto/gui/kernel/kernel.pro @@ -34,6 +34,6 @@ win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop !qtHaveModule(network): SUBDIRS -= \ qguieventloop -!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= qopenglwindow +!qtConfig(opengl(es2)?): SUBDIRS -= qopenglwindow uikit: SUBDIRS -= qclipboard diff --git a/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro b/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro index 5e4875d1e7..7e98704aea 100644 --- a/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro +++ b/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro @@ -5,4 +5,4 @@ QT += core-private network gui-private testlib SOURCES += tst_noqteventloop.cpp -contains(QT_CONFIG,dynamicgl):win32:!winrt: LIBS += -luser32 +qtConfig(dynamicgl):win32:!winrt: LIBS += -luser32 diff --git a/tests/auto/gui/kernel/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro index f975e00ffa..844b3e8507 100644 --- a/tests/auto/gui/kernel/qwindow/qwindow.pro +++ b/tests/auto/gui/kernel/qwindow/qwindow.pro @@ -5,4 +5,4 @@ QT += core-private gui-private testlib SOURCES += tst_qwindow.cpp -contains(QT_CONFIG,dynamicgl):win32:!winrt: LIBS += -luser32 +qtConfig(dynamicgl):win32:!winrt: LIBS += -luser32 diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro index 0f7595c871..831fffab30 100644 --- a/tests/auto/gui/painting/painting.pro +++ b/tests/auto/gui/painting/painting.pro @@ -16,7 +16,7 @@ SUBDIRS=\ qwmatrix \ qpolygon \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qpathclipper \ diff --git a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro index e153460bf2..671220f94b 100644 --- a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro +++ b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro @@ -5,6 +5,6 @@ HEADERS += paths.h SOURCES += tst_qpathclipper.cpp paths.cpp QT += gui-private testlib -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) unix:!darwin:!haiku:!integrity: LIBS += -lm diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro index a4ef016e39..aaef6e5125 100644 --- a/tests/auto/gui/qopengl/qopengl.pro +++ b/tests/auto/gui/qopengl/qopengl.pro @@ -8,4 +8,4 @@ QT += gui-private core-private testlib SOURCES += tst_qopengl.cpp -linux:contains(QT_CONFIG, xcb-glx):contains(QT_CONFIG, xcb-xlib):!contains(QT_CONFIG, egl): DEFINES += USE_GLX +linux:qtConfig(xcb-glx):qtConfig(xcb-xlib):!qtConfig(egl): DEFINES += USE_GLX diff --git a/tests/auto/gui/text/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro index b92859d4fb..e2bb3eeea8 100644 --- a/tests/auto/gui/text/qcssparser/qcssparser.pro +++ b/tests/auto/gui/text/qcssparser/qcssparser.pro @@ -3,7 +3,7 @@ TARGET = tst_qcssparser SOURCES += tst_qcssparser.cpp QT += xml gui-private testlib -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) DEFINES += SRCDIR=\\\"$$PWD\\\" android { diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro index 0f4906ce4d..09d0dd4126 100644 --- a/tests/auto/gui/text/qstatictext/qstatictext.pro +++ b/tests/auto/gui/text/qstatictext/qstatictext.pro @@ -4,4 +4,4 @@ QT += testlib SOURCES += tst_qstatictext.cpp -contains(QT_CONFIG, private_tests): QT += core-private gui-private +qtConfig(private_tests): QT += core-private gui-private diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro index 1419e32012..0bbe0c8c4e 100644 --- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro @@ -6,5 +6,5 @@ SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h requires(!win32) -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro index 9160141c60..bb4984767f 100644 --- a/tests/auto/gui/text/text.pro +++ b/tests/auto/gui/text/text.pro @@ -27,7 +27,7 @@ SUBDIRS=\ win32:SUBDIRS -= qtextpiecetable -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qfontcache \ qcssparser \ qtextlayout \ diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro index 58cfd781a9..1d78cf253b 100644 --- a/tests/auto/network/access/access.pro +++ b/tests/auto/network/access/access.pro @@ -15,7 +15,7 @@ SUBDIRS=\ hpack \ http2 -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qhttpnetworkconnection \ qhttpnetworkreply \ qftp \ diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro index 6f1a4a7543..1959c1acac 100644 --- a/tests/auto/network/access/qftp/qftp.pro +++ b/tests/auto/network/access/qftp/qftp.pro @@ -2,5 +2,5 @@ CONFIG += testcase TARGET = tst_qftp SOURCES += tst_qftp.cpp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core network network-private testlib diff --git a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro index bd20fd33dd..d32b651b86 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qhttpnetworkconnection SOURCES += tst_qhttpnetworkconnection.cpp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core-private network-private testlib diff --git a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro index 1810a38f6e..31570e6f01 100644 --- a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qhttpnetworkreply SOURCES += tst_qhttpnetworkreply.cpp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core-private network-private testlib diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 772bb55990..47e7f5ed15 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -10,7 +10,7 @@ RESOURCES += ../qnetworkreply.qrc TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ ../index.html ../smb-file.txt -contains(QT_CONFIG,xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102 +qtConfig(xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102 win32:CONFIG += insignificant_test # QTBUG-24226 !winrt: TEST_HELPER_INSTALLS = ../echo/echo diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro index 6c3a234de5..42df80dfa1 100644 --- a/tests/auto/network/kernel/kernel.pro +++ b/tests/auto/network/kernel/kernel.pro @@ -18,7 +18,7 @@ winrt: SUBDIRS -= \ osx: SUBDIRS -= \ # QTBUG-41847 qhostinfo \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qauthenticator \ qhostinfo \ diff --git a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro index 5e4759b690..5038eea9af 100644 --- a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro +++ b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qauthenticator -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core network-private testlib SOURCES += tst_qauthenticator.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index 4ea415c529..67a37faeb5 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -3,7 +3,7 @@ TARGET = tst_qhostinfo SOURCES += tst_qhostinfo.cpp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core-private network-private testlib win32:LIBS += -lws2_32 diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri index 6c7857ea1d..46c722deba 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri @@ -6,7 +6,7 @@ INCLUDEPATH += $$QNETWORK_SRC win32:LIBS += -lws2_32 -unix:contains(QT_CONFIG, reduce_exports) { +unix:qtConfig(reduce_exports) { SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine_unix.cpp SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine.cpp SOURCES += $$QNETWORK_SRC/socket/qabstractsocketengine.cpp diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro index eee762037d..ab96bb444e 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro @@ -4,7 +4,7 @@ SOURCES += tst_platformsocketengine.cpp include(../platformsocketengine/platformsocketengine.pri) -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) MOC_DIR=tmp diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index 12ce576e23..56a4fb8aee 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -7,6 +7,6 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro index f3c24e19fd..71ceafa133 100644 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro @@ -10,4 +10,4 @@ MOC_DIR=tmp QT = core-private network-private testlib -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro index 5686f4a697..1183b23556 100644 --- a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro +++ b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs SUBDIRS = test !vxworks: SUBDIRS += stressTest -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro index 75f9e3f3a0..307f7e92de 100644 --- a/tests/auto/network/socket/socket.pro +++ b/tests/auto/network/socket/socket.pro @@ -10,13 +10,13 @@ SUBDIRS=\ platformsocketengine \ qsctpsocket \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ platformsocketengine \ qtcpsocket \ qhttpsocketengine \ qsocks5socketengine \ -!contains(QT_CONFIG, sctp): SUBDIRS -= \ +!qtConfig(sctp): SUBDIRS -= \ qsctpsocket \ winrt: SUBDIRS -= \ diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index 52377a9005..8c3877631a 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -3,7 +3,7 @@ CONFIG += testcase SOURCES += tst_qsslkey.cpp win32:LIBS += -lws2_32 QT = core network testlib -contains(QT_CONFIG, private_tests) { +qtConfig(private_tests) { QT += core-private network-private } diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index 9a525408fd..5c92ca833a 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -15,11 +15,11 @@ win32 { } # OpenSSL support -contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { +qtConfig(openssl)|qtConfig(openssl-linked) { # Add optional SSL libs LIBS += $$OPENSSL_LIBS } DEFINES += SRCDIR=\\\"$$PWD/\\\" -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 4ea878f840..c862b3d3ae 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -17,4 +17,4 @@ win32 { DEFINES += SRCDIR=\\\"$$PWD/\\\" -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index d69ea7fb3d..c27a58fcd2 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -16,4 +16,4 @@ win32 { DEFINES += SRCDIR=\\\"$$PWD/\\\" -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index df7c10ed19..65e35ea4c0 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -6,8 +6,8 @@ SUBDIRS=\ qsslerror \ qsslkey \ -contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { - contains(QT_CONFIG, private_tests) { +qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) { + qtConfig(private_tests) { SUBDIRS += \ qsslsocket \ qsslsocket_onDemandCertificates_member \ @@ -19,8 +19,8 @@ winrt: SUBDIRS -= \ qsslsocket_onDemandCertificates_member \ qsslsocket_onDemandCertificates_static \ -contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { - contains(QT_CONFIG, private_tests) { +qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) { + qtConfig(private_tests) { SUBDIRS += qasn1element \ qssldiffiehellmanparameters } diff --git a/tests/auto/other/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro index 19f86582e9..5a00e53878 100644 --- a/tests/auto/other/compiler/compiler.pro +++ b/tests/auto/other/compiler/compiler.pro @@ -3,7 +3,7 @@ TARGET = tst_compiler SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp othersource.cpp HEADERS += baseclass.h derivedclass.h QT = core testlib -contains(QT_CONFIG, c++11): CONFIG += c++11 -contains(QT_CONFIG, c++14): CONFIG += c++14 +qtConfig(c++11): CONFIG += c++11 +qtConfig(c++14): CONFIG += c++14 diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 3b264e6b72..94b5847b2e 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -51,9 +51,9 @@ cross_compile: SUBDIRS -= \ atwrapper \ compiler -!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility +!qtConfig(accessibility): SUBDIRS -= qaccessibility -!contains(QT_CONFIG, accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux +!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux !mac: SUBDIRS -= \ macgui \ diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index f697aee38f..fb9de6f450 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qaccessibility -requires(contains(QT_CONFIG,accessibility)) +requires(qtConfig(accessibility)) QT += testlib core-private gui-private widgets-private SOURCES += tst_qaccessibility.cpp HEADERS += accessiblewidgets.h diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index c6667824d9..cf548f2dea 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -13,7 +13,7 @@ SUBDIRS=\ qsidebar \ qwizard \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qsidebar \ mac:qinputdialog.CONFIG += no_check_target # QTBUG-25496 diff --git a/tests/auto/widgets/graphicsview/graphicsview.pro b/tests/auto/widgets/graphicsview/graphicsview.pro index dce3c6dda9..e99897a4f6 100644 --- a/tests/auto/widgets/graphicsview/graphicsview.pro +++ b/tests/auto/widgets/graphicsview/graphicsview.pro @@ -19,7 +19,7 @@ SUBDIRS=\ qgraphicsview \ qgraphicswidget \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qgraphicsanchorlayout \ qgraphicsanchorlayout1 \ qgraphicsitem \ diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro index 3b74ab0c75..42c260d480 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qgraphicssceneindex -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qgraphicssceneindex.cpp diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro index 2bd8ec43d3..af0b6aeef0 100644 --- a/tests/auto/widgets/itemviews/itemviews.pro +++ b/tests/auto/widgets/itemviews/itemviews.pro @@ -17,7 +17,7 @@ SUBDIRS=\ qtreewidget \ qtreewidgetitemiterator \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qcolumnview \ qlistwidget \ diff --git a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro index c96004bd5d..7d9a8576d3 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -5,4 +5,4 @@ QT += widgets widgets-private gui-private testlib SOURCES += tst_qstylesheetstyle.cpp RESOURCES += resources.qrc -requires(contains(QT_CONFIG,private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/widgets/styles/styles.pro b/tests/auto/widgets/styles/styles.pro index 952a659eaa..9d7464cb5b 100644 --- a/tests/auto/widgets/styles/styles.pro +++ b/tests/auto/widgets/styles/styles.pro @@ -5,7 +5,7 @@ SUBDIRS=\ qstyleoption \ qstylesheetstyle \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qstylesheetstyle \ # This test can only be run on Mac OS: diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro index 0651583867..a8e8f6d865 100644 --- a/tests/auto/widgets/widgets/widgets.pro +++ b/tests/auto/widgets/widgets/widgets.pro @@ -48,10 +48,10 @@ SUBDIRS=\ qtoolbutton \ # The following tests depend on private API: -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!qtConfig(private_tests): SUBDIRS -= \ qcombobox \ qmainwindow \ qtextedit \ qtoolbar \ -contains(QT_CONFIG, opengl): SUBDIRS += qopenglwidget +qtConfig(opengl): SUBDIRS += qopenglwidget diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index dd97169551..70f803f56f 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -1,7 +1,7 @@ TARGET = tst_bench_qdbustype QT -= gui QT += core-private dbus-private testlib -contains(QT_CONFIG, dbus-linked) { +qtConfig(dbus-linked) { DEFINES += QT_LINKED_LIBDBUS QMAKE_USE += dbus } else { diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 7da38e8e60..828f36348d 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -3,6 +3,6 @@ TARGET = tst_bench_imageConversion QT += testlib SOURCES += tst_qimageconversion.cpp -contains(QT_CONFIG, gif):DEFINES += QTEST_HAVE_GIF -contains(QT_CONFIG, jpeg):DEFINES += QTEST_HAVE_JPEG -contains(QT_CONFIG, c++11): CONFIG += c++11 +qtConfig(gif): DEFINES += QTEST_HAVE_GIF +qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG +qtConfig(c++11): CONFIG += c++11 diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index b60618d7ec..7de1eedbdf 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -5,6 +5,6 @@ TARGET = tst_bench_qimagereader SOURCES += tst_qimagereader.cpp -contains(QT_CONFIG, gif):DEFINES += QTEST_HAVE_GIF -contains(QT_CONFIG, jpeg):DEFINES += QTEST_HAVE_JPEG +qtConfig(gif): DEFINES += QTEST_HAVE_GIF +qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG QT += network diff --git a/tests/benchmarks/network/kernel/kernel.pro b/tests/benchmarks/network/kernel/kernel.pro index 53ec370d60..7b18eefda2 100644 --- a/tests/benchmarks/network/kernel/kernel.pro +++ b/tests/benchmarks/network/kernel/kernel.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -contains(QT_CONFIG,private_tests):SUBDIRS += \ +qtConfig(private_tests): SUBDIRS += \ qhostinfo diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro index ec812407f7..01b3b80ef4 100644 --- a/tests/benchmarks/network/network.pro +++ b/tests/benchmarks/network/network.pro @@ -8,7 +8,7 @@ TRUSTED_BENCHMARKS += \ kernel/qhostinfo \ socket/qtcpserver -contains(QT_CONFIG, openssl) { +qtConfig(openssl) { SUBDIRS += ssl TRUSTED_BENCHMARKS += ssl/qsslsocket } diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index b9789c354d..2fe96c2f93 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -53,11 +53,11 @@ dialogs \ windowtransparency \ unc -!contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions +!qtConfig(openssl):!qtConfig(openssl-linked): SUBDIRS -= qssloptions -contains(QT_CONFIG, opengl) { +qtConfig(opengl) { SUBDIRS += qopengltextureblitter - contains(QT_CONFIG, egl): SUBDIRS += qopenglcontext + qtConfig(egl): SUBDIRS += qopenglcontext } win32: SUBDIRS -= network_remote_stresstest network_stresstest diff --git a/tests/tests.pro b/tests/tests.pro index 22f606bbc6..346102ab7b 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -4,4 +4,4 @@ SUBDIRS = auto # benchmarks in debug mode is rarely sensible # benchmarks are not sensible for code coverage (here with tool testcocoon) -!uikit:!testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks +!uikit:!testcocoon:contains(QT_CONFIG, release): SUBDIRS += benchmarks |