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>

3 files changed, 24 insertions, 24 deletions

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