1 files changed, 20 insertions, 6 deletions

diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 43a5f2757..f12bf5ae9 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -23,23 +23,40 @@ defineTest(runConfigure) {
     isQtMinimum(5, 8) {
         include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
         QT_FOR_CONFIG += webengine-private
+
+        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
+    } else {
+        cross_compile: WEBENGINE_CONFIG += embedded_build
+    }
+    isQtMinimum(5, 9) {
+        qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code
+        linux: WEBENGINE_CONFIG += use_gn
+        macos: WEBENGINE_CONFIG += use_gn
+        win32: WEBENGINE_CONFIG += use_gn
     }
+    !use?(gn): skipBuild("Chromium 55 and new can only be built with GN")
 
     linux {
         QT_FOR_CONFIG += gui-private
         !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
 
         REQUIRED_PACKAGES = dbus-1 fontconfig
-        !cross_compile: qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
+        !contains(WEBENGINE_CONFIG, embedded_build): qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
         qtConfig(pulseaudio): REQUIRED_PACKAGES += libpulse
         qtConfig(system-png): REQUIRED_PACKAGES += libpng
         qtConfig(system-harfbuzz) {
              packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz
              else: log("System harfbuzz is too old (min. version 1.2). Using Chromium's copy.$${EOL}")
         }
-        !cross_compile: REQUIRED_PACKAGES += libpci
+        qtConfig(glib) {
+             packagesExist("\'glib-2.0 >= 2.32.0\'"): WEBENGINE_CONFIG += use_glib
+             else: skipBuild("System glib is too old (min. version 2.32).$${EOL}")
+        }
 
         for(package, $$list($$REQUIRED_PACKAGES)) {
             !packagesExist($$package):skipBuild("Unmet dependency: $$package")
@@ -80,14 +97,11 @@ defineTest(runConfigure) {
             WEBENGINE_CONFIG += use_bundled_snappy
         }
 
-        !cross_compile {
+        !contains(WEBENGINE_CONFIG, embedded_build) {
             packagesExist(nss): WEBENGINE_CONFIG += use_nss
             else: log("System NSS not found, BoringSSL will be used.$${EOL}")
         }
     }
-    !cross_compile {
-        WEBENGINE_CONFIG += enable_pdf
-    }
 
     isEmpty(skipBuildReason): {
         cache(CONFIG, add, $$list(webengine_successfully_configured))