1 files changed, 33 insertions, 10 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 4ade28271..85b948db2 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -1,17 +1,28 @@
 include(common.pri)
-include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-QT_FOR_CONFIG += gui-private webengine-private
+QT_FOR_CONFIG += gui-private webenginecore-private
 
 gn_args += \
     use_cups=false \
     use_gio=false \
     use_gnome_keyring=false \
-    use_kerberos=false \
     linux_use_bundled_binutils=false \
     use_udev=true \
-    use_bundled_fontconfig=false
-
-gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
+    use_bundled_fontconfig=false \
+    use_sysroot=false \
+    enable_session_service=false \
+    toolkit_views=false \
+    use_ozone=true \
+    ozone_auto_platforms=false \
+    ozone_platform_headless=false \
+    ozone_platform_external=true \
+    ozone_platform=\"qt\"
+
+qtConfig(webengine-embedded-build) {
+    gn_args += is_desktop_linux=false
+    gn_args += use_gold=false
+} else {
+    !use_gold_linker: gn_args += use_gold=false
+}
 
 clang {
     clang_full_path = $$which($${QMAKE_CXX})
@@ -54,6 +65,7 @@ contains(QT_ARCH, "arm") {
         gn_args += arm_version=$$MARMV
     }
 
+    # TODO: use neon detection from qtbase
     !lessThan(MARMV, 8) {
         gn_args += arm_use_neon=true
     } else {
@@ -68,8 +80,16 @@ contains(QT_ARCH, "arm") {
         }
     }
 
-    if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): gn_args += arm_use_thumb=false
-    else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true
+    qtConfig(webengine-arm-thumb) {
+        gn_args += arm_use_thumb=true # this adds -mthumb
+    } else {
+        gn_args += arm_use_thumb=false
+        !qtConfig(webengine-system-ffmpeg) {
+             # Fixme QTBUG-71772
+             gn_args += media_use_ffmpeg=false
+             gn_args += use_webaudio_ffmpeg=false
+        }
+    }
 }
 
 contains(QT_ARCH, "mips") {
@@ -132,7 +152,6 @@ host_build {
         gn_args += use_system_libpng=true
         qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_libpng=true
     }
-    qtConfig(webengine-system-png): gn_args += use_system_libpng=true
     qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true
     qtConfig(webengine-system-freetype): gn_args += use_system_freetype=true
     qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true
@@ -148,7 +167,11 @@ host_build {
         gn_args += use_alsa=false
     }
     !packagesExist(libpci): gn_args += use_libpci=false
-    !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false
+
+    qtConfig(webengine-system-x11): hasX11Dependencies() {
+        gn_args += ozone_platform_x11=true
+        packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true
+    }
 
     qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true
     qtConfig(webengine-system-libwebp):  gn_args += use_system_libwebp=true