Remove WEBENGINE_CONFIG from configure

Do not store flags in qmake.cache with WEBENGINE_CONFIG.
Use directly qtConfig values insted. This makes configuration
more consistent, simplifies handling and avoids passing
values from qtConfig to WEBENIGNE_CONFIG, which then
were passed to gn.

[ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure

Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 2 insertions, 71 deletions

diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index ed6fe6c15..ed9882735 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -4,7 +4,6 @@ load(functions)
 load(platform)
 
 defineTest(runConfigure) {
-    webengine_successfully_configured: return(true)
 
     !exists(src/3rdparty/chromium) {
         skipBuild("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.")
@@ -48,26 +47,6 @@ defineTest(runConfigure) {
         return(false)
     }
 
-    qtConfig(pepper-plugins): WEBENGINE_CONFIG += use_pepper_plugins
-    qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf
-    qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs
-    qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker
-    qtConfig(webrtc): WEBENGINE_CONFIG += use_webrtc
-    qtConfig(embedded): WEBENGINE_CONFIG += embedded_build
-    qtConfig(system-webp): WEBENGINE_CONFIG += use_system_libwebp
-    qtConfig(system-opus): WEBENGINE_CONFIG += use_system_opus
-    qtConfig(system-ffmpeg): WEBENGINE_CONFIG += use_system_ffmpeg
-    qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu
-    qtConfig(system-re2): WEBENGINE_CONFIG += use_system_re2
-
-    !contains(WEBENGINE_CONFIG, use_system_libwebp): WEBENGINE_CONFIG += use_bundled_libwebp
-    !contains(WEBENGINE_CONFIG, use_system_opus): WEBENGINE_CONFIG += use_bundled_opus
-    !contains(WEBENGINE_CONFIG, use_system_ffmpeg): WEBENGINE_CONFIG += use_bundled_ffmpeg
-    !contains(WEBENGINE_CONFIG, use_system_icu): WEBENGINE_CONFIG += use_bundled_icu
-
-    qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code
-    optimize_size: WEBENGINE_CONFIG += reduce_binary_size
-
     sanitizer: !qtConfig(webengine-sanitizer) {
         skipBuild("Chosen sanitizer configuration is not supported. Use --feature-webengine-sanitizer=yes to force build with the chosen sanitizer configuration.")
         return(false);
@@ -93,9 +72,7 @@ defineTest(runConfigure) {
             }
          }
 
-        WEBENGINE_CONFIG += use_nss
-
-        !contains(WEBENGINE_CONFIG, embedded_build): qtConfig(xcb) {
+        !qtConfig(embedded): qtConfig(xcb) {
              for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
                  !qtConfig(system-$$package) {
                      skipBuild("A suitable version of $$package could not be found.")
@@ -103,47 +80,6 @@ defineTest(runConfigure) {
                  }
              }
         }
-
-        # Fix me: mamke system-png a public feature in gui
-        qtConfig(system-png): qtConfig(webengine-system-png) {
-             WEBENGINE_CONFIG += use_system_libpng
-        }
-        # Fix me: make system-harfbuzz a public feautre in gui
-        qtConfig(system-harfbuzz): qtConfig(webengine-system-harfbuzz) {
-             WEBENGINE_CONFIG += use_system_harfbuzz
-        }
-        qtConfig(system-glib) {
-             WEBENGINE_CONFIG += use_glib
-        }
-        qtConfig(system-minizip) {
-             WEBENGINE_CONFIG += use_system_minizip
-        }
-        qtConfig(system-zlib) {
-             WEBENGINE_CONFIG += use_system_zlib
-        }
-        qtConfig(system-libxml2) {
-            WEBENGINE_CONFIG += use_system_libxslt use_system_libxml2
-        }
-
-        for(package, $$list("libevent jsoncpp protobuf libvpx libsrtp snappy")) {
-            qtConfig(system-$$package) {
-                WEBENGINE_CONFIG += use_system_$$package
-            } else {
-                WEBENGINE_CONFIG += use_bundled_$$package
-            }
-        }
-    }
-
-    isEmpty(skipBuildReason) {
-        cache(CONFIG, add, $$list(webengine_successfully_configured))
-        !isEmpty(WEBENGINE_CONFIG) {
-            cache(WEBENGINE_CONFIG, add, $$list($$WEBENGINE_CONFIG))
-            export(WEBENGINE_CONFIG)
-        }
-    }
-
-    macos:qtConfig(native-spellchecker) {
-        WEBENGINE_CONFIG+=use_native_spellchecker
     }
 }
 
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index 0074a27b0..3f0d64ba5 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -47,11 +47,6 @@ defineReplace(which) {
   return($$out)
 }
 
-defineTest(use?) {
-    contains(WEBENGINE_CONFIG, use_$$lower($$1)): return(true)
-    return(false)
-}
-
 # Returns the unquoted path to the python executable.
 defineReplace(pythonPath) {
     isEmpty(QMAKE_PYTHON2) {
@@ -88,7 +83,7 @@ defineReplace(gnPath) {
 
 defineReplace(gnArgs) {
     linux {
-        contains(WEBENGINE_CONFIG, embedded_build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri)
+        qtConfig(embedded): 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)