Add 'webengine' prefix to configure features, tests, libraries, etc

This is done to make sure there are no conflicts with features in
other modules, because they all share a global namespace.

Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

24 files changed, 279 insertions, 258 deletions

diff --git a/config_help.txt b/config_help.txt
index 6ff24f8c8..8055de910 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -1,13 +1,23 @@
 Webengine options:
-
-  -alsa ................ Enable ALSA support [auto] (Linux only)
-  -webengine-icu ....... Select used ICU libraries [system/qt] (Linux only)
-  -ffmpeg .............. Select used FFmpeg libraries [system/qt] (Linux only)
-  -opus ................ Select used Opus libraries [system/qt] (Linux only)
-  -webp ................ Select used WebP libraries [system/qt] (Linux only)
-  -pepper-plugins ...... Enable use of Pepper Flash and Widevine plugins [auto]
-  -printing-and-pdf .... Enable use of printing and output to PDF [auto]
-  -proprietary-codecs .. Enable support for proprietary codecs [no]
-  -pulseaudio .......... Enable PulseAudio support [auto] (Linux only)
-  -spellchecker ........ Enable support for spellchecker [yes]
-  -webrtc .............. Enable support for WebRTC [auto]
+  -webengine-alsa ................ Enable ALSA support [auto] (Linux only)
+  -webengine-pulseaudio .......... Enable PulseAudio support [auto]
+                                   (Linux only)
+  -webengine-embedded-build ...... Enable Linux embedded build [auto]
+                                   (Linux only)
+  -webengine-icu ................. Use system ICU libraries [system/qt]
+                                   (Linux only)
+  -webengine-ffmpeg .............. Use system FFmpeg libraries [system/qt]
+                                   (Linux only)
+  -webengine-opus ................ Use system Opus libraries [system/qt]
+                                   (Linux only)
+  -webengine-webp ................ Use system WebP libraries [system/qt]
+                                   (Linux only)
+  -webengine-pepper-plugins ...... Enable use of Pepper Flash and Widevine
+                                   plugins [auto]
+  -webengine-printing-and-pdf .... Enable use of printing and output to PDF
+                                   [auto]
+  -webengine-proprietary-codecs .. Enable support for proprietary codecs [no]
+  -webengine-spellchecker ........ Enable support for spellchecker [yes]
+  -webengine-native-spellchecker . Enable support for native spellchecker [no]
+                                   (macOS only)
+  -webengine-webrtc .............. Enable support for WebRTC [auto]
diff --git a/configure.json b/configure.json
index c3a82f32d..d0d172835 100644
--- a/configure.json
+++ b/configure.json
@@ -8,115 +8,126 @@
 
     "commandline": {
         "options": {
-            "alsa": "boolean",
-            "embedded": "boolean",
-            "webengine-icu": { "type": "enum", "name": "system-icu", "values": { "system": "yes", "qt": "no" } },
-            "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
-            "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } },
-            "webp": { "type": "enum", "name": "system-libwebp", "values": { "system": "yes", "qt": "no" } },
-            "pepper-plugins": "boolean",
-            "printing-and-pdf": "boolean",
-            "proprietary-codecs": "boolean",
-            "pulseaudio": "boolean",
-            "spellchecker": "boolean",
-            "native-spellchecker": "boolean",
-            "webrtc": "boolean",
-            "geolocation" : "boolean"
+            "webengine-alsa": "boolean",
+            "webengine-embedded-build": "boolean",
+            "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
+            "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
+            "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
+            "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
+            "webengine-pepper-plugins": "boolean",
+            "webengine-printing-and-pdf": "boolean",
+            "webengine-proprietary-codecs": "boolean",
+            "webengine-pulseaudio": "boolean",
+            "webengine-spellchecker": "boolean",
+            "webengine-native-spellchecker": "boolean",
+            "webengine-webrtc": "boolean",
+            "webengine-geolocation" : "boolean",
+
+            "alsa": { "type": "boolean", "name": "webengine-alsa" },
+            "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
+            "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
+            "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
+            "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
+            "pepper-plugins": { "type": "boolean", "name": "webengine-pepper-plugins" },
+            "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
+            "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
+            "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
+            "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
         }
     },
 
     "libraries": {
-        "dbus": {
+        "webengine-dbus": {
             "label": "d-bus",
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1" }
             ]
         },
-        "fontconfig": {
+        "webengine-fontconfig": {
             "label": "fontconfig",
             "sources": [
                 { "type": "pkgConfig", "args": "fontconfig" }
             ]
         },
-        "libdrm": {
+        "webengine-libdrm": {
             "label": "libdrm",
             "sources": [
                 { "type": "pkgConfig", "args": "libdrm" }
             ]
         },
-        "xcomposite": {
+        "webengine-xcomposite": {
             "label": "xcomposite",
             "sources": [
                 { "type": "pkgConfig", "args": "xcomposite" }
             ]
         },
-        "xcursor": {
+        "webengine-xcursor": {
             "label": "xcursor",
             "sources": [
                 { "type": "pkgConfig", "args": "xcursor" }
             ]
         },
-        "xi": {
+        "webengine-xi": {
             "label": "xi",
             "sources": [
                 { "type": "pkgConfig", "args": "xi" }
             ]
         },
-        "xrandr": {
+        "webengine-xrandr": {
             "label": "xrandr",
             "sources": [
                 { "type": "pkgConfig", "args": "xrandr" }
             ]
         },
-        "xtst": {
+        "webengine-xtst": {
             "label": "xtst",
             "sources": [
                 { "type": "pkgConfig", "args": "xtst" }
             ]
         },
-        "harfbuzz": {
+        "webengine-harfbuzz": {
             "label": "harfbuzz >= 1.4.2",
             "sources": [
                 { "type": "pkgConfig", "args": "harfbuzz >= 1.4.2" }
             ]
         },
-        "glib": {
+        "webengine-glib": {
             "label": "glib-2.0 >= 2.32.0",
             "sources": [
                 { "type": "pkgConfig", "args": "glib-2.0 >= 2.32.0" }
             ]
         },
-        "zlib": {
+        "webengine-zlib": {
             "label": "zlib",
             "sources": [
                 { "type": "pkgConfig", "args": "zlib" }
             ]
         },
-        "minizip": {
+        "webengine-minizip": {
             "label": "minizip",
             "sources": [
                 { "type": "pkgConfig", "args": "minizip" }
             ]
         },
-        "libevent": {
+        "webengine-libevent": {
             "label": "libevent",
             "sources": [
                 { "type": "pkgConfig", "args": "libevent" }
             ]
         },
-        "libxml2": {
+        "webengine-libxml2": {
             "label": "libxml2 and libxslt",
             "sources": [
                 { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
             ]
         },
-        "jsoncpp": {
+        "webengine-jsoncpp": {
             "label": "jsoncpp",
             "sources": [
                 { "type": "pkgConfig", "args": "jsoncpp" }
             ]
         },
-        "protobuf": {
+        "webengine-protobuf": {
             "label": "protobuf",
             "sources": [
                 { "type": "pkgConfig", "args": "protobuf" }
@@ -128,43 +139,43 @@
                 { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
             ]
         },
-        "icu": {
+        "webengine-icu": {
             "label": "icu >= 53",
             "sources": [
                 { "type": "pkgConfig", "args": "icu-uc >= 53 icu-i18n >= 53" }
             ]
         },
-        "ffmpeg": {
+        "webengine-ffmpeg": {
             "label": "libavcodec libavformat libavutil",
             "sources": [
                 { "type": "pkgConfig", "args": "libavcodec libavformat libavutil" }
             ]
         },
-        "opus": {
+        "webengine-opus": {
             "label": "opus",
             "sources": [
                 { "type": "pkgConfig", "args": "opus" }
             ]
         },
-        "webp": {
+        "webengine-webp": {
             "label": "libwebp, libwebpmux and libwebpdemux",
             "sources": [
                 { "type": "pkgConfig", "args": "libwebp libwebpmux libwebpdemux" }
             ]
         },
-        "nss": {
+        "webengine-nss": {
             "label": "nss",
             "sources": [
                 { "type": "pkgConfig", "args": "nss" }
             ]
         },
-        "png": {
+        "webengine-png": {
             "label": "libpng >= 1.6.0",
             "sources": [
                 { "type": "pkgConfig", "args": "libpng >= 1.6.0" }
             ]
         },
-        "lcms2": {
+        "webengine-lcms2": {
             "label": "lcms2",
             "sources": [
                 { "type": "pkgConfig", "args": "lcms2" }
@@ -178,353 +189,353 @@
             "test": "alsa",
             "type": "compile"
         },
-        "khr": {
+        "webengine-khr": {
             "label": "khr",
             "test": "khr",
             "type": "compile"
         },
-        "libvpx": {
+        "webengine-libvpx": {
             "label": "libvpx",
             "test": "libvpx",
             "type": "compile"
         },
-        "snappy": {
+        "webengine-snappy": {
             "label": "snappy",
             "test": "snappy",
             "type": "compile"
         },
-        "srtp": {
+        "webengine-srtp": {
             "label": "srtp",
             "test": "srtp",
             "type": "compile"
         },
-        "winversion": {
+        "webengine-winversion": {
             "label": "winversion",
             "test": "winversion",
             "type": "compile"
         },
-        "protoc": {
+        "webengine-protoc": {
             "label": "protoc",
             "type": "detectProtoc"
         },
-        "python2": {
+        "webengine-python2": {
             "label": "python2",
             "type": "detectPython2",
             "log": "location"
         },
-        "gperf": {
+        "webengine-gperf": {
             "label": "gperf",
             "type": "detectGperf"
         },
-        "bison": {
+        "webengine-bison": {
             "label": "bison",
             "type": "detectBison"
         },
-        "flex": {
+        "webengine-flex": {
             "label": "flex",
             "type": "detectFlex"
         },
-        "ninja": {
+        "webengine-ninja": {
             "label": "system ninja",
             "type": "detectNinja"
         },
-        "gn": {
+        "webengine-gn": {
             "label": "system gn",
             "type": "detectGn"
         },
-        "embedded": {
+        "webengine-embedded-build": {
             "label": "embedded",
             "type": "embedded"
         },
-        "re2": {
+        "webengine-re2": {
             "label": "re2",
             "test": "re2",
             "type": "compile"
         },
-        "glibc": {
+        "webengine-glibc": {
             "label": "glibc > 2.16",
             "type": "detectGlibc"
         },
-        "icuuc": {
+        "webengine-icuuc": {
             "label" : "libxml2 configured with icuuc",
             "type": "detectIcuuc"
         },
-        "sanitizer": {
+        "webengine-sanitizer": {
             "label" : "sanitizer support",
             "type": "isSanitizerSupported"
         }
     },
 
     "features": {
-        "system-fontconfig": {
+        "webengine-system-fontconfig": {
             "label": "fontconfig",
-            "condition": "libs.fontconfig",
+            "condition": "libs.webengine-fontconfig",
             "output": [ "privateFeature" ]
         },
-        "system-dbus": {
+        "webengine-system-dbus": {
             "label": "dbus",
-            "condition": "libs.dbus",
+            "condition": "libs.webengine-dbus",
             "output": [ "privateFeature" ]
         },
-        "system-libdrm": {
+        "webengine-system-libdrm": {
             "label": "libdrm",
-            "condition": "libs.libdrm",
+            "condition": "libs.webengine-libdrm",
             "output": [ "privateFeature" ]
         },
-        "system-xcomposite": {
+        "webengine-system-xcomposite": {
             "label": "xcomposite",
-            "condition": "libs.xcomposite",
+            "condition": "libs.webengine-xcomposite",
             "output": [ "privateFeature" ]
         },
-        "system-xcursor": {
+        "webengine-system-xcursor": {
             "label": "xcursor",
-            "condition": "libs.xcursor",
+            "condition": "libs.webengine-xcursor",
             "output": [ "privateFeature" ]
         },
-        "system-xi": {
+        "webengine-system-xi": {
             "label": "xi",
-            "condition": "libs.xi",
+            "condition": "libs.webengine-xi",
             "output": [ "privateFeature" ]
         },
-        "system-xrandr": {
+        "webengine-system-xrandr": {
             "label": "xrandr",
-            "condition": "libs.xrandr",
+            "condition": "libs.webengine-xrandr",
             "output": [ "privateFeature" ]
         },
-        "system-xtst": {
+        "webengine-system-xtst": {
             "label": "xtst",
-            "condition": "libs.xtst",
+            "condition": "libs.webengine-xtst",
             "output": [ "privateFeature" ]
         },
         "webengine-system-harfbuzz": {
             "label": "harfbuzz",
-            "condition": "config.unix && features.system-harfbuzz && libs.harfbuzz",
+            "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
             "output": [ "privateFeature" ]
         },
-        "system-glib" : {
+        "webengine-system-glib" : {
             "label": "glib",
-            "condition": "config.unix && libs.glib",
+            "condition": "config.unix && libs.webengine-glib",
             "output": [ "privateFeature" ]
         },
-        "system-minizip" : {
+        "webengine-system-minizip" : {
             "label": "minizip",
-            "condition": "config.unix && libs.minizip",
+            "condition": "config.unix && libs.webengine-minizip",
             "output": [ "privateFeature" ]
         },
         "webengine-system-zlib" : {
             "label": "zlib",
-            "condition": "config.unix && features.system-zlib && libs.zlib",
+            "condition": "config.unix && features.system-zlib && libs.webengine-zlib",
             "output": [ "privateFeature" ]
         },
-        "system-libevent" : {
+        "webengine-system-libevent" : {
             "label": "libevent",
-            "condition": "config.unix && libs.libevent",
+            "condition": "config.unix && libs.webengine-libevent",
             "output": [ "privateFeature" ]
         },
-        "system-jsoncpp" : {
+        "webengine-system-jsoncpp" : {
             "label": "jsoncpp",
-            "condition": "config.unix && libs.jsoncpp",
+            "condition": "config.unix && libs.webengine-jsoncpp",
             "output": [ "privateFeature" ]
         },
-        "system-protobuf" : {
+        "webengine-system-protobuf" : {
             "label": "protobuf",
-            "condition": "config.unix && libs.protobuf && tests.protoc",
+            "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
             "output": [ "privateFeature" ]
         },
         "webengine-system-png" : {
             "label": "png",
-            "condition": "config.unix && features.system-png && libs.png",
+            "condition": "config.unix && features.system-png && libs.webengine-png",
             "output": [ "privateFeature" ]
         },
-        "python2": {
+        "webengine-python2": {
             "label": "python2",
-            "condition": "tests.python2",
+            "condition": "tests.webengine-python2",
             "output": [
                 "privateFeature",
-                { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.python2.location" }
+                { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
             ]
         },
-        "gperf": {
+        "webengine-gperf": {
             "label": "gperf",
-            "condition": "tests.gperf",
+            "condition": "tests.webengine-gperf",
             "output": [ "privateFeature" ]
         },
-        "bison": {
+        "webengine-bison": {
             "label": "bison",
-            "condition": "tests.bison",
+            "condition": "tests.webengine-bison",
             "output": [ "privateFeature" ]
         },
-        "flex": {
+        "webengine-flex": {
             "label": "flex",
-            "condition": "tests.flex",
+            "condition": "tests.webengine-flex",
             "output": [ "privateFeature" ]
         },
-        "embedded": {
+        "webengine-embedded-build": {
             "label": "Embedded build",
             "purpose": "Enables the embedded build configuration.",
             "section": "WebEngine",
             "condition": "config.unix",
-            "autoDetect": "tests.embedded",
+            "autoDetect": "tests.webengine-embedded-build",
             "output": [ "privateFeature" ]
         },
-        "alsa": {
+        "webengine-alsa": {
             "label": "Use ALSA",
             "condition": "config.unix && tests.alsa",
             "output": [ "privateFeature" ]
         },
-        "system-khr" : {
+        "webengine-system-khr" : {
             "label": "khr",
-            "condition": "config.unix && tests.khr",
+            "condition": "config.unix && tests.webengine-khr",
             "output": [ "privateFeature" ]
         },
-        "system-libvpx" : {
+        "webengine-system-libvpx" : {
             "label": "libvpx",
-            "condition": "config.unix && tests.libvpx",
+            "condition": "config.unix && tests.webengine-libvpx",
             "output": [ "privateFeature" ]
         },
-        "system-snappy" : {
+        "webengine-system-snappy" : {
             "label": "snappy",
-            "condition": "config.unix && tests.snappy",
+            "condition": "config.unix && tests.webengine-snappy",
             "output": [ "privateFeature" ]
         },
-        "system-libsrtp" : {
+        "webengine-system-libsrtp" : {
             "label": "libsrtp",
-            "condition": "config.unix && tests.srtp",
+            "condition": "config.unix && tests.webengine-srtp",
             "output": [ "privateFeature" ]
         },
-        "winversion" : {
+        "webengine-winversion" : {
             "label": "winversion",
-            "condition": "config.win32 && tests.winversion",
+            "condition": "config.win32 && tests.webengine-winversion",
             "output": [ "privateFeature" ]
         },
-        "geolocation": {
+        "webengine-geolocation": {
             "label": "Geolocation",
             "condition": "module.positioning",
             "output": [ "privateFeature" ]
         },
-        "pulseaudio": {
+        "webengine-pulseaudio": {
             "label": "Use PulseAudio",
             "autoDetect": "config.unix",
             "condition": "libs.pulseaudio",
             "output": [ "privateFeature" ]
         },
-        "pepper-plugins": {
+        "webengine-pepper-plugins": {
             "label": "Pepper Plugins",
             "purpose": "Enables use of Pepper Flash and Widevine plugins.",
             "section": "WebEngine",
-            "autoDetect": "!features.embedded",
+            "autoDetect": "!features.webengine-embedded-build",
             "output": [ "privateFeature" ]
         },
-        "printing-and-pdf": {
+        "webengine-printing-and-pdf": {
             "label": "Printing and PDF",
             "purpose": "Provides printing and output to PDF.",
             "section": "WebEngine",
             "condition": "module.printsupport && features.printer",
-            "autoDetect": "!features.embedded",
+            "autoDetect": "!features.webengine-embedded-build",
             "output": [ "privateFeature" ]
         },
-        "proprietary-codecs": {
+        "webengine-proprietary-codecs": {
             "label": "Proprietary Codecs",
             "purpose": "Enables the use of proprietary codecs such as h.264/h.265 and MP3.",
             "section": "WebEngine",
             "autoDetect": false,
             "output": [ "privateFeature" ]
         },
-        "spellchecker": {
+        "webengine-spellchecker": {
             "label": "Spellchecker",
             "purpose": "Provides a spellchecker.",
             "section": "WebEngine",
             "output": [ "publicFeature" ]
         },
-        "native-spellchecker": {
+        "webengine-native-spellchecker": {
             "label": "Native Spellchecker",
             "purpose": "Use the system's native spellchecking engine.",
             "section": "WebEngine",
             "autoDetect": false,
-            "condition": "config.macos && features.spellchecker",
+            "condition": "config.macos && features.webengine-spellchecker",
             "output": [ "publicFeature" ]
         },
-        "ui-delegates": {
+        "webengine-ui-delegates": {
             "label": "UI Delegates",
             "output": [ "privateFeature" ]
         },
-        "testsupport": {
+        "webengine-testsupport": {
             "label": "Test Support",
             "autoDetect": "features.private_tests || call.isTestsInBuildParts",
             "output": [ "privateFeature" ]
         },
-        "webrtc": {
+        "webengine-webrtc": {
             "label": "WebRTC",
             "purpose": "Provides WebRTC support.",
             "section": "WebEngine",
-            "autoDetect": "!features.embedded",
+            "autoDetect": "!features.webengine-embedded-build",
             "output": [ "privateFeature" ]
         },
-        "system-nss": {
+        "webengine-system-nss": {
             "label": "nss",
-            "condition": "config.unix && !config.darwin && libs.nss",
+            "condition": "config.unix && !config.darwin && libs.webengine-nss",
             "output": [ "privateFeature" ]
         },
-        "system-libwebp": {
+        "webengine-system-libwebp": {
             "label": "libwebp, libwebpmux and libwebpdemux",
             "autoDetect": "config.unix",
-            "condition": "libs.webp",
+            "condition": "libs.webengine-webp",
             "output": [ "privateFeature" ]
         },
-        "system-opus": {
+        "webengine-system-opus": {
             "label": "opus",
             "autoDetect": "config.unix",
-            "condition": "libs.opus",
+            "condition": "libs.webengine-opus",
             "output": [ "privateFeature" ]
         },
-        "system-ffmpeg": {
+        "webengine-system-ffmpeg": {
             "label": "ffmpeg",
             "autoDetect": false,
-            "condition": "libs.ffmpeg && features.system-opus && features.system-libwebp",
+            "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
             "output": [ "privateFeature" ]
         },
-        "system-icu": {
+        "webengine-system-icu": {
             "label": "icu",
             "autoDetect": false,
-            "condition": "libs.icu",
+            "condition": "libs.webengine-icu",
             "output": [ "privateFeature" ]
         },
-        "system-re2": {
+        "webengine-system-re2": {
             "label": "re2",
             "autoDetect": "config.unix",
-            "condition": "tests.re2",
+            "condition": "tests.webengine-re2",
             "output": [ "privateFeature" ]
         },
-        "system-ninja": {
+        "webengine-system-ninja": {
             "label": "Use System Ninja",
-            "condition": "tests.ninja",
+            "condition": "tests.webengine-ninja",
             "output": [ "privateFeature" ]
         },
-        "system-gn": {
+        "webengine-system-gn": {
             "label": "Use System Gn",
             "autoDetect": false,
-            "condition": "tests.gn",
+            "condition": "tests.webengine-gn",
             "output": [ "privateFeature" ]
         },
-        "system-glibc": {
+        "webengine-system-glibc": {
             "label": "glibc",
-            "condition": "config.linux && tests.glibc",
+            "condition": "config.linux && tests.webengine-glibc",
             "output": [ "privateFeature" ]
         },
-        "system-libxml2": {
+        "webengine-system-libxml2": {
             "label": "libxml2 and libxslt",
-            "condition": "config.unix && libs.libxml2 && tests.icuuc",
+            "condition": "config.unix && libs.webengine-libxml2 && tests.webengine-icuuc",
             "output": [ "privateFeature" ]
         },
-        "system-lcms2" : {
+        "webengine-system-lcms2" : {
             "label": "lcms2",
-            "autoDetect": "libs.lcms2",
+            "autoDetect": "libs.webengine-lcms2",
             "condition": "config.unix && features.printing-and-pdf",
             "output": [ "privateFeature" ]
         },
         "webengine-sanitizer" : {
             "label": "Sanitizer ",
-            "autoDetect": "config.sanitizer && tests.sanitizer",
+            "autoDetect": "config.sanitizer && tests.webengine-sanitizer",
             "condition": "config.sanitizer",
             "output": [ "privateFeature" ]
         }
@@ -533,22 +544,22 @@
     "report": [
         {
             "type": "warning",
-            "condition": "!features.python2",
+            "condition": "!features.webengine-python2",
             "message": "Python version 2 (2.7.5 or later) is required to build QtWebEngine."
         },
         {
             "type": "warning",
-            "condition": "!features.gperf",
+            "condition": "!features.webengine-gperf",
             "message": "gperf is required to build QtWebEngine."
         },
         {
             "type": "warning",
-            "condition": "!features.bison",
+            "condition": "!features.webengine-bison",
             "message": "bison is required to build QtWebEngine."
         },
         {
             "type": "warning",
-            "condition": "!features.flex",
+            "condition": "!features.webengine-flex",
             "message": "flex is required to build QtWebEngine."
         }
     ],
@@ -557,45 +568,45 @@
         {
             "section": "Qt WebEngine",
             "entries": [
-                "embedded",
-                "pepper-plugins",
-                "printing-and-pdf",
-                "proprietary-codecs",
-                "spellchecker",
-                "native-spellchecker",
-                "webrtc",
-                "system-ninja",
-                "geolocation",
+                "webengine-embedded-build",
+                "webengine-pepper-plugins",
+                "webengine-printing-and-pdf",
+                "webengine-proprietary-codecs",
+                "webengine-spellchecker",
+                "webengine-native-spellchecker",
+                "webengine-webrtc",
+                "webengine-system-ninja",
+                "webengine-geolocation",
                 {
                     "type": "feature",
-                    "args": "alsa",
+                    "args": "webengine-alsa",
                     "condition": "config.unix"
                 },
                 {
                     "type": "feature",
-                    "args": "pulseaudio",
+                    "args": "webengine-pulseaudio",
                     "condition": "config.unix"
                 },
                 {
                    "section": "Optional system libraries used",
                    "condition": "config.unix",
                    "entries": [
-                        "system-re2",
-                        "system-icu",
-                        "system-libwebp",
-                        "system-opus",
-                        "system-ffmpeg",
-                        "system-libvpx",
-                        "system-snappy",
-                        "system-libsrtp",
-                        "system-glib",
+                        "webengine-system-re2",
+                        "webengine-system-icu",
+                        "webengine-system-libwebp",
+                        "webengine-system-opus",
+                        "webengine-system-ffmpeg",
+                        "webengine-system-libvpx",
+                        "webengine-system-snappy",
+                        "webengine-system-libsrtp",
+                        "webengine-system-glib",
                         "webengine-system-zlib",
-                        "system-minizip",
-                        "system-libevent",
-                        "system-jsoncpp",
-                        "system-protobuf",
-                        "system-libxml2",
-                        "system-lcms2",
+                        "webengine-system-minizip",
+                        "webengine-system-libevent",
+                        "webengine-system-jsoncpp",
+                        "webengine-system-protobuf",
+                        "webengine-system-libxml2",
+                        "webengine-system-lcms2",
                         "webengine-system-png",
                         "webengine-system-harfbuzz"
                     ]
@@ -604,23 +615,23 @@
                    "section": "Required system libraries",
                    "condition": "config.unix && !config.macos",
                    "entries": [
-                        "system-fontconfig",
-                        "system-dbus",
-                        "system-nss",
-                        "system-khr",
-                        "system-glibc"
+                        "webengine-system-fontconfig",
+                        "webengine-system-dbus",
+                        "webengine-system-nss",
+                        "webengine-system-khr",
+                        "webengine-system-glibc"
                     ]
                 },
                 {
                    "section": "Required system libraries for qpa-xcb",
                    "condition": "config.unix && !config.macos",
                    "entries": [
-                        "system-libdrm",
-                        "system-xcomposite",
-                        "system-xcursor",
-                        "system-xi",
-                        "system-xrandr",
-                        "system-xtst"
+                        "webengine-system-libdrm",
+                        "webengine-system-xcomposite",
+                        "webengine-system-xcursor",
+                        "webengine-system-xi",
+                        "webengine-system-xrandr",
+                        "webengine-system-xtst"
                     ]
                 }
             ]
diff --git a/examples/webenginewidgets/spellchecker/spellchecker.pro b/examples/webenginewidgets/spellchecker/spellchecker.pro
index a5f59974a..d41f2c4f7 100644
--- a/examples/webenginewidgets/spellchecker/spellchecker.pro
+++ b/examples/webenginewidgets/spellchecker/spellchecker.pro
@@ -5,7 +5,7 @@ TARGET = spellchecker
 QT += webenginewidgets
 CONFIG += c++11
 
-qtConfig(native-spellchecker) {
+qtConfig(webengine-native-spellchecker) {
     error("Spellcheck example can not be built when using native OS dictionaries.")
 }
 
diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro
index 8e91c530b..ed8fa2561 100644
--- a/examples/webenginewidgets/webenginewidgets.pro
+++ b/examples/webenginewidgets/webenginewidgets.pro
@@ -14,7 +14,7 @@ SUBDIRS += \
 
 qtHaveModule(positioning): SUBDIRS += maps
 
-qtConfig(spellchecker):!qtConfig(native-spellchecker):!cross_compile {
+qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile {
     SUBDIRS += spellchecker
 } else {
     message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.")
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index ed9882735..904e7b1c0 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -30,19 +30,19 @@ defineTest(runConfigure) {
     include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
     QT_FOR_CONFIG += webengine-private
 
-    !qtConfig(gperf) {
+    !qtConfig(webengine-gperf) {
         skipBuild("Required gperf could not be found.")
         return(false)
     }
-    !qtConfig(bison) {
+    !qtConfig(webengine-bison) {
         skipBuild("Required bison could not be found.")
         return(false)
     }
-    !qtConfig(flex) {
+    !qtConfig(webengine-flex) {
         skipBuild("Required flex could not be found.")
         return(false)
     }
-    !qtConfig(python2) {
+    !qtConfig(webengine-python2) {
         skipBuild("A suitable version of python2 could not be found.")
         return(false)
     }
@@ -53,28 +53,28 @@ defineTest(runConfigure) {
     }
 
     linux {
-        !qtConfig(system-glibc) {
+        !qtConfig(webengine-system-glibc) {
             skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898")
             return(false)
         }
 
         QT_FOR_CONFIG += gui-private
 
-        !qtConfig(system-khr) {
+        !qtConfig(webengine-system-khr) {
             skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
             return(false)
         }
 
         for(package, $$list("nss dbus fontconfig")) {
-            !qtConfig(system-$$package) {
+            !qtConfig(webengine-system-$$package) {
                 skipBuild("A suitable version of $$package could not be found.")
                 return(false)
             }
          }
 
-        !qtConfig(embedded): qtConfig(xcb) {
+        !qtConfig(webengine-embedded-build): qtConfig(xcb) {
              for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
-                 !qtConfig(system-$$package) {
+                 !qtConfig(webengine-system-$$package) {
                      skipBuild("A suitable version of $$package could not be found.")
                      return(false)
                  }
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index c15b5118d..3b9a400b1 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -78,7 +78,7 @@ defineReplace(gnPath) {
 
 defineReplace(gnArgs) {
     linux {
-        qtConfig(embedded): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri)
+        qtConfig(webengine-embedded-build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri)
         else: include($$QTWEBENGINE_ROOT/src/core/config/desktop_linux.pri)
     }
     macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri)
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
index 0b0bb6746..bb171f753 100644
--- a/mkspecs/features/platform.prf
+++ b/mkspecs/features/platform.prf
@@ -33,7 +33,7 @@ defineTest(isPlatformSupported) {
       skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.")
       return(false)
     }
-    !qtConfig(winversion) {
+    !qtConfig(webengine-winversion) {
          skipBuild("Needs VS 2015 Update 3 with Cumulative Servicing Release or higher")
          return(false)
     }
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index 9d9af9eb8..f66f4bd68 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -7,11 +7,11 @@ include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
 QT_FOR_CONFIG += webengine webengine-private
 
 build_pass|!debug_and_release {
-    !qtConfig(system-gn): CONFIG(release, debug|release) {
+    !qtConfig(webengine-system-gn): CONFIG(release, debug|release) {
         buildgn.target = build_gn
         gn_args = $$gnArgs()
         out = $$gnPath()
-        !qtConfig(system-ninja): ninja_path = "--path $$ninjaPath()"
+        !qtConfig(webengine-system-ninja): ninja_path = "--path $$ninjaPath()"
         # check if it is not already build
         !exists($$out) {
             mkpath($$dirname(out))
diff --git a/src/buildtools/ninja.pro b/src/buildtools/ninja.pro
index c99513f85..1b15bcb6b 100644
--- a/src/buildtools/ninja.pro
+++ b/src/buildtools/ninja.pro
@@ -7,7 +7,7 @@ QT_FOR_CONFIG += webengine-private
 
 
 build_pass|!debug_and_release {
-    !qtConfig(system-ninja): CONFIG(release, debug|release) {
+    !qtConfig(webengine-system-ninja): CONFIG(release, debug|release) {
         out = $$ninjaPath()
         # check if it is not already build
         !exists($$out) {
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index e7010a13a..c1d5331ab 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -14,7 +14,7 @@ gn_args += \
     enable_swiftshader=false \
     use_custom_libcxx=false
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
     gn_args += enable_pdf=true
 } else {
@@ -22,25 +22,25 @@ qtConfig(printing-and-pdf) {
     gn_args += enable_pdf=false
 }
 
-qtConfig(pepper-plugins) {
+qtConfig(webengine-pepper-plugins) {
     gn_args += enable_plugins=true enable_widevine=true
 } else {
     gn_args += enable_plugins=false enable_widevine=false
 }
 
-qtConfig(spellchecker) {
+qtConfig(webengine-spellchecker) {
     gn_args += enable_spellcheck=true
 } else {
     gn_args += enable_spellcheck=false
 }
 
-qtConfig(webrtc) {
+qtConfig(webengine-webrtc) {
     gn_args += enable_webrtc=true
 } else {
     gn_args += enable_webrtc=false
 }
 
-qtConfig(proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+qtConfig(webengine-proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
 CONFIG(release, debug|release) {
     force_debug_info {
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index fbe44dc4c..c5329dfcc 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -115,7 +115,7 @@ host_build {
         gn_args += host_pkg_config=\"pkg-config\"
     }
 
-    qtConfig(webengine-system-zlib): qtConfig(system-minizip) {
+    qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) {
         gn_args += use_system_zlib=true use_system_minizip=true
         qtConfig(printing-and-pdf): gn_args += pdfium_use_system_zlib=true
     }
@@ -123,13 +123,13 @@ host_build {
     qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
     qtConfig(system-freetype): gn_args += use_system_freetype=true
     qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true
-    qtConfig(system-glib): gn_args += use_glib=false
-    qtConfig(pulseaudio) {
+    qtConfig(webengine-system-glib): gn_args += use_glib=false
+    qtConfig(webengine-pulseaudio) {
         gn_args += use_pulseaudio=true
     } else {
         gn_args += use_pulseaudio=false
     }
-    qtConfig(alsa) {
+    qtConfig(webengine-alsa) {
         gn_args += use_alsa=true
     } else {
         gn_args += use_alsa=false
@@ -139,19 +139,19 @@ host_build {
     !packagesExist(libpci): gn_args += use_libpci=false
     !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false
 
-    qtConfig(system-libevent): gn_args += use_system_libevent=true
-    qtConfig(system-libwebp):  gn_args += use_system_libwebp=true
-    qtConfig(system-libxml2):  gn_args += use_system_libxml=true use_system_libxslt=true
-    qtConfig(system-opus):     gn_args += use_system_opus=true
-    qtConfig(system-snappy):   gn_args += use_system_snappy=true
-    qtConfig(system-libvpx):   gn_args += use_system_libvpx=true
-    qtConfig(system-icu):      gn_args += use_system_icu=true icu_use_data_file=false
-    qtConfig(system-ffmpeg):   gn_args += use_system_ffmpeg=true
-    qtConfig(system-re2):      gn_args += use_system_re2=true
-    qtConfig(system-lcms2):    gn_args += use_system_lcms2=true
+    qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true
+    qtConfig(webengine-system-libwebp):  gn_args += use_system_libwebp=true
+    qtConfig(webengine-system-libxml2):  gn_args += use_system_libxml=true use_system_libxslt=true
+    qtConfig(webengine-system-opus):     gn_args += use_system_opus=true
+    qtConfig(webengine-system-snappy):   gn_args += use_system_snappy=true
+    qtConfig(webengine-system-libvpx):   gn_args += use_system_libvpx=true
+    qtConfig(webengine-system-icu):      gn_args += use_system_icu=true icu_use_data_file=false
+    qtConfig(webengine-system-ffmpeg):   gn_args += use_system_ffmpeg=true
+    qtConfig(webengine-system-re2):      gn_args += use_system_re2=true
+    qtConfig(webengine-system-lcms2):    gn_args += use_system_lcms2=true
 
     # FIXME:
-    #qtConfig(system-protobuf): gn_args += use_system_protobuf=true
-    #qtConfig(system-jsoncpp):  gn_args += use_system_jsoncpp=true
-    #qtConfig(system-libsrtp: gn_args += use_system_libsrtp=true
+    #qtConfig(webengine-system-protobuf): gn_args += use_system_protobuf=true
+    #qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true
+    #qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true
 }
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 57f301f18..2d820c889 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -32,8 +32,8 @@ gn_args += \
     toolkit_views=false \
     use_external_popup_menu=false
 
-qtConfig(spellchecker) {
-    qtConfig(native-spellchecker): gn_args += use_browser_spellchecker=true
+qtConfig(webengine-spellchecker) {
+    qtConfig(webengine-native-spellchecker): gn_args += use_browser_spellchecker=true
     else: gn_args += use_browser_spellchecker=false
 } else {
     gn_args += use_browser_spellchecker=false
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 8e24645f0..0ec6979c8 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -28,7 +28,7 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
 
 # Assume that we want mobile touch and low-end hardware behaviors
 # whenever we are cross compiling.
-qtConfig(embedded): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
+qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
 
 qtConfig(egl): CONFIG += egl
 
@@ -186,7 +186,7 @@ HEADERS = \
         web_engine_settings.h \
         web_event_factory.h
 
-qtConfig(pepper-plugins) {
+qtConfig(webengine-pepper-plugins) {
 
     SOURCES += \
         renderer_host/pepper/pepper_flash_browser_host_qt.cpp \
@@ -203,7 +203,7 @@ qtConfig(pepper-plugins) {
         renderer/pepper/pepper_renderer_host_factory_qt.h
 }
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
 
     SOURCES += \
         printing_message_filter_qt.cpp \
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 78bb8baee..2409ccb12 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -115,7 +115,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         resources.path = $$[QT_INSTALL_DATA]/resources
         INSTALLS += locales resources
 
-        !qtConfig(system-icu) {
+        !qtConfig(webengine-system-icu) {
             icu.CONFIG += no_check_exist
             icu.path = $$[QT_INSTALL_DATA]/resources
             INSTALLS += icu
@@ -127,7 +127,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         # Copy essential files to the qtbase build directory for non-prefix builds
         #
 
-        !qtConfig(system-icu) {
+        !qtConfig(webengine-system-icu) {
             COPIES += icu
         }
 
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index a9089c569..dbf859100 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -5,7 +5,7 @@ TEMPLATE = aux
 
 qtConfig(debug_and_release): CONFIG += debug_and_release build_all
 
-qtConfig(system-ninja) {
+qtConfig(webengine-system-ninja) {
     QT_TOOL.ninja.binary = ninja
 } else {
     QT_TOOL.ninja.binary = $$shell_quote($$shell_path($$ninjaPath()))
@@ -35,7 +35,7 @@ build_pass|!debug_and_release {
 
     gn_args += "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
 
-    !qtConfig(system-gn) {
+    !qtConfig(webengine-system-gn) {
         gn_binary = $$system_quote($$system_path($$gnPath()))
     }
 
diff --git a/src/src.pro b/src/src.pro
index 76d342c8d..d675f1f13 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -20,20 +20,20 @@ SUBDIRS += buildtools \
            plugins
 
 
-qtConfig(spellchecker):!qtConfig(native-spellchecker):!cross_compile {
+qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile {
     SUBDIRS += qwebengine_convert_dict
     qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
     qwebengine_convert_dict.depends = core
 }
 
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
     webengine_testsupport_plugin.subdir = webengine/plugin/testsupport
     webengine_testsupport_plugin.target = sub-webengine-testsupport-plugin
     webengine_testsupport_plugin.depends = webengine
     SUBDIRS += webengine_testsupport_plugin
 }
 
-qtConfig(ui-delegates) {
+qtConfig(webengine-ui-delegates) {
     SUBDIRS += webengine/ui \
                webengine/ui2
 }
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 24fa2d9d8..58e1263a7 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -58,7 +58,7 @@ HEADERS = \
         render_widget_host_view_qt_delegate_quickwindow.h \
         ui_delegates_manager.h
 
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
     QT += testlib
 
     SOURCES += api/qquickwebenginetestsupport.cpp
@@ -67,11 +67,11 @@ qtConfig(testsupport) {
     DEFINES += ENABLE_QML_TESTSUPPORT_API
 }
 
-qtConfig(spellchecker) {
+qtConfig(webengine-spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
     DEFINES += ENABLE_PDF
 }
 
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index ffe9cc0de..540c4d538 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -44,17 +44,17 @@ HEADERS = \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h
 
-qtConfig(ui-delegates) {
+qtConfig(webengine-ui-delegates) {
     SOURCES += ui/messagebubblewidget.cpp
     HEADERS += ui/messagebubblewidget_p.h
     DEFINES += QT_UI_DELEGATES
 }
 
-qtConfig(spellchecker) {
+qtConfig(webengine-spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
     DEFINES += ENABLE_PRINTING
     DEFINES += ENABLE_PDF
     QT += printsupport
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index 9530e115c..56e61138d 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -100,7 +100,7 @@ OTHER_FILES += \
 load(qt_build_paths)
 DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
 
-!qtConfig(testsupport) {
+!qtConfig(webengine-testsupport) {
     PLUGIN_EXTENSION = .so
     PLUGIN_PREFIX = lib
     osx: PLUGIN_PREFIX = .dylib
diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
index 0f62ec21d..25bf44597 100644
--- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
+++ b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
@@ -5,7 +5,7 @@ QT_PRIVATE += webengine-private gui-private
 
 HEADERS += ../shared/util.h
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
     DEFINES += ENABLE_PDF
 }
 
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 2e6343469..e67cf0ed0 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -8,7 +8,7 @@ SUBDIRS += \
     qquickwebenginedefaultsurfaceformat \
     qquickwebengineview
 
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
     SUBDIRS += \
         qmltests \
         qquickwebengineviewgraphics
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index 15f6517a4..7983a248f 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -19,7 +19,7 @@ QT += testlib network quick webengine
 # This define is used by some tests to look up resources in the source tree
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
 
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
     DEFINES += ENABLE_QML_TESTSUPPORT_API
 }
 
diff --git a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
index a2dbd4d70..47c09e1ce 100644
--- a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
+++ b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
@@ -1,4 +1,4 @@
 include(../tests.pri)
 QT *= core-private
 
-qtConfig(printing-and-pdf): DEFINES+=QWEBENGINEPAGE_PDFPRINTINGENABLED
+qtConfig(webengine-printing-and-pdf): DEFINES+=QWEBENGINEPAGE_PDFPRINTINGENABLED
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index 027eeb235..32a7806fe 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -19,8 +19,8 @@ qtConfig(accessibility) {
     SUBDIRS += qwebengineaccessibility
 }
 
-qtConfig(spellchecker):!cross_compile {
-    !qtConfig(native-spellchecker) {
+qtConfig(webengine-spellchecker):!cross_compile {
+    !qtConfig(webengine-native-spellchecker) {
         SUBDIRS += qwebenginespellcheck
     } else {
         message("Spellcheck test will not be built because it depends on usage of Hunspell dictionaries.")