1 files changed, 5 insertions, 46 deletions

diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index 455a2e3c6..56c18bdb5 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -24,10 +24,6 @@ gn_args += \
     ozone_platform=\"qt\" \
     ozone_extra_path=\"$$QTWEBENGINE_ROOT/src/core/ozone/ozone_extra.gni\"
 
-qtConfig(build-qtwebengine-core):qtConfig(webengine-embedded-build) {
-    gn_args += is_desktop_linux=false
-}
-
 use_gold_linker: gn_args += use_gold=true
 else: gn_args += use_gold=false
 
@@ -90,7 +86,7 @@ contains(QT_ARCH, "arm") {
         }
     }
 
-    qtConfig(build-qtwebengine-core):qtConfig(webengine-arm-thumb) {
+    qtConfig(webengine-arm-thumb) {
         gn_args += arm_use_thumb=true # this adds -mthumb
     } else {
         gn_args += arm_use_thumb=false
@@ -156,16 +152,13 @@ host_build {
 
     qtConfig(webengine-system-zlib) {
         qtConfig(webengine-system-minizip): gn_args += use_system_zlib=true use_system_minizip=true
-        qtConfig(build-qtpdf) || qtConfig(webengine-printing-and-pdf) {
-            gn_args += pdfium_use_system_zlib=true
-        }
+        gn_args += pdfium_use_system_zlib=true
     }
+
     qtConfig(webengine-system-png) {
-        gn_args += use_system_libpng=true
-        qtConfig(build-qtpdf) || qtConfig(webengine-printing-and-pdf) {
-            gn_args += pdfium_use_system_libpng=true
-        }
+        gn_args += use_system_libpng=true pdfium_use_system_libpng=true
     }
+
     qtConfig(webengine-system-jpeg) {
         gn_args += use_system_libjpeg=true
     } else {
@@ -182,38 +175,4 @@ host_build {
         gn_args += use_system_harfbuzz=false
     }
     gn_args += use_glib=false
-    qtConfig(build-qtwebengine-core):qtConfig(webengine-pulseaudio) {
-        gn_args += use_pulseaudio=true
-    } else {
-        gn_args += use_pulseaudio=false
-    }
-    qtConfig(build-qtwebengine-core):qtConfig(webengine-alsa) {
-        gn_args += use_alsa=true
-    } else {
-        gn_args += use_alsa=false
-    }
-    !packagesExist(libpci): gn_args += use_libpci=false
-
-    qtConfig(build-qtwebengine-core):qtConfig(webengine-ozone-x11) {
-        gn_args += ozone_platform_x11=true
-        gn_args += use_xkbcommon=true
-        packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true
-        qtConfig(webengine-webrtc): gn_args += rtc_use_x11=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(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
 }