1 files changed, 21 insertions, 17 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 78f3e5093..6f7b27f10 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -112,23 +112,26 @@ host_build {
         # Strip '>2 /dev/null' from $$pkgConfigExecutable()
         PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
         gn_args += pkg_config=\"$$PKGCONFIG\"
-        gn_args += host_pkg_config=\"pkg-config\"
+        PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST)
+        isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = pkg-config
+        gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\"
     }
 
-    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(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true
     }
     qtConfig(webengine-system-png): gn_args += use_system_libpng=true
     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
@@ -138,18 +141,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(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
 }