GN configuration cleanup and preparation

Reintroduces the shared linux.pri configuration and moves configuration
shared by all architectures to common.pri

Change-Id: Iff4d1e6e3d98280223cce0c2c0b74d71ef99df5f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 49 insertions, 14 deletions

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index d13d9f8d9..7cdf34623 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -1,6 +1,15 @@
 # Shared configuration for all our supported platforms
 
 use?(gn) {
+    gn_args += \
+        use_qt=true \
+        is_component_build=false \
+        enable_remoting=false \
+        enable_nacl=false \
+        use_experimental_allocator_shim=false \
+        use_allocator=\"none\" \
+        v8_use_external_startup_data=false \
+        treat_warnings_as_errors=false
 
     use?(printing) {
         gn_args += enable_basic_printing=true enable_print_preview=true
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index f8bd42ce8..e8db4248f 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -1,19 +1,9 @@
+include(linux.pri)
 
 use?(gn) {
-    include(common.pri)
     gn_args += \
-        use_qt=true \
         is_clang=false \
-        use_sysroot=false \
-        enable_remoting=false \
-        enable_nacl=false \
-        use_kerberos=false \
-        is_component_build=false \
-        use_experimental_allocator_shim=false \
-        use_allocator=\"none\" \
-        v8_use_external_startup_data=false \
-        linux_use_bundled_binutils=false \
-        treat_warnings_as_errors=false
+        use_sysroot=false
 
     use?(icecc) {
         gn_args += use_debug_fission=false
@@ -23,8 +13,6 @@ use?(gn) {
 
     GYP_ARGS += "-D qt_os=\"desktop_linux\""
 
-    include(linux.pri)
-
     GYP_CONFIG += \
         desktop_linux=1
 
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index b91e795ca..8509c0c8e 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -2,6 +2,44 @@ include(common.pri)
 include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
 QT_FOR_CONFIG += gui-private webengine-private
 
+use?(gn) {
+    gn_args += \
+        use_gconf=false \
+        use_gio=false \
+        use_kerberos=false \
+        linux_use_bundled_binutils=false
+
+    #qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true
+    #qtConfig(system-png): gn_args += use_system_libpng=true
+    qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
+    qtConfig(system-harfbuzz): use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
+    !qtConfig(glib): gn_args += use_glib=false
+    qtConfig(pulseaudio) {
+        gn_args += use_pulseaudio=true
+    } else {
+        gn_args += use_pulseaudio=false
+    }
+    qtConfig(alsa) {
+        gn_args += use_alsa=true
+    } else {
+        gn_args += use_alsa=false
+    }
+
+    #use?(system_libevent): gn_args += use_system_libevent=true
+    #use?(system_libwebp):  gn_args += use_system_libwebp=true
+    #use?(system_libsrtp):  gn_args += use_system_libsrtp=true
+    #use?(system_libxslt):  gn_args += use_system_libxml=true use_system_libxslt=true
+    #use?(system_jsoncpp):  gn_args += use_system_jsoncpp=true
+    #use?(system_opus):     gn_args += use_system_opus=true
+    #use?(system_snappy):   gn_args += use_system_snappy=true
+    #use?(system_vpx):      gn_args += use_system_libvpx=true
+    #use?(system_icu):      gn_args += use_system_icu=true icu_use_data_file_flag=false
+    #use?(system_ffmpeg):   gn_args += use_system_ffmpeg=true
+    #use?(system_protobuf): gn_args += use_system_protobuf=true
+
+    #gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
+}
+
 # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
 # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system.
 GYP_CONFIG += \