1 files changed, 17 insertions, 10 deletions

diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index ee08f81bc..c02af3909 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -5,7 +5,7 @@ defineReplace(extractCFlag) {
     return($$qtwebengine_extractCFlag($$1))
 }
 
-QT_FOR_CONFIG += gui-private webenginecore-private
+QT_FOR_CONFIG += gui-private webenginecore-private pdf-private
 
 gn_args += \
     use_cups=false \
@@ -17,8 +17,6 @@ gn_args += \
     use_sysroot=false \
     enable_session_service=false \
     is_cfi=false \
-    strip_absolute_paths_from_debug_symbols=false \
-    toolkit_views=false \
     use_ozone=true \
     ozone_auto_platforms=false \
     ozone_platform_headless=false \
@@ -26,7 +24,7 @@ gn_args += \
     ozone_platform=\"qt\" \
     ozone_extra_path=\"$$QTWEBENGINE_ROOT/src/core/ozone/ozone_extra.gni\"
 
-qtConfig(webengine-embedded-build) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-embedded-build) {
     gn_args += is_desktop_linux=false
 }
 
@@ -92,7 +90,7 @@ contains(QT_ARCH, "arm") {
         }
     }
 
-    qtConfig(webengine-arm-thumb) {
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-arm-thumb) {
         gn_args += arm_use_thumb=true # this adds -mthumb
     } else {
         gn_args += arm_use_thumb=false
@@ -158,11 +156,15 @@ host_build {
 
     qtConfig(webengine-system-zlib) {
         qtConfig(webengine-system-minizip): gn_args += use_system_zlib=true use_system_minizip=true
-        qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true
+        qtConfig(build-qtpdf) || qtConfig(webengine-printing-and-pdf) {
+            gn_args += pdfium_use_system_zlib=true
+        }
     }
     qtConfig(webengine-system-png) {
         gn_args += use_system_libpng=true
-        qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_libpng=true
+        qtConfig(build-qtpdf) || qtConfig(webengine-printing-and-pdf) {
+            gn_args += pdfium_use_system_libpng=true
+        }
     }
     qtConfig(webengine-system-jpeg) {
         gn_args += use_system_libjpeg=true
@@ -180,19 +182,24 @@ host_build {
         gn_args += use_system_harfbuzz=false
     }
     gn_args += use_glib=false
-    qtConfig(webengine-pulseaudio) {
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-pulseaudio) {
         gn_args += use_pulseaudio=true
     } else {
         gn_args += use_pulseaudio=false
     }
-    qtConfig(webengine-alsa) {
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-alsa) {
         gn_args += use_alsa=true
     } else {
         gn_args += use_alsa=false
     }
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-system-xkbcommon) {
+        gn_args += use_xkbcommon=true
+    } else {
+        gn_args += use_xkbcommon=false
+    }
     !packagesExist(libpci): gn_args += use_libpci=false
 
-    qtConfig(webengine-ozone-x11) {
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-ozone-x11) {
         gn_args += ozone_platform_x11=true
         packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true
         qtConfig(webengine-webrtc): gn_args += rtc_use_x11=true