Qt GN integration

Exclude source files we override in the qt webengine sources.

Change-Id: I79925220265602bd0c39e5e03162cf1dca15befe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 16 insertions, 2 deletions

diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 1c4be8d187e..18c9b9c58a2 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -16,6 +16,9 @@ import("//build/toolchain/cc_wrapper.gni")
 import("//build/toolchain/toolchain.gni")
 import("//build_overrides/build.gni")
 
+# Import features.gni for the "use_qt" argument to be available.
+import("//build/config/features.gni")
+
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
@@ -300,6 +303,12 @@ config("compiler") {
     }
   }
 
+  if (use_qt && is_clang) {
+    cflags += [
+      "-Wno-unknown-warning-option"
+    ]
+  }
+
   if (is_clang && is_debug) {
     # Allow comparing the address of references and 'this' against 0
     # in debug builds. Technically, these can never be null in
diff --git a/chromium/build/config/linux/pangocairo/pangocairo.gni b/chromium/build/config/linux/pangocairo/pangocairo.gni
index ca99445b967..92d32e0f449 100644
--- a/chromium/build/config/linux/pangocairo/pangocairo.gni
+++ b/chromium/build/config/linux/pangocairo/pangocairo.gni
@@ -4,4 +4,4 @@
 
 import("//build/config/ui.gni")
 
-use_pangocairo = is_linux && !use_ozone
+use_pangocairo = use_gtk
diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index 547b42fb5c6..c3d01677ef0 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -18,6 +18,7 @@
 # of //build/config/BUILDCONFIG.gn.
 
 import("//build/config/chromecast_build.gni")
+import("//build/config/features.gni")
 
 declare_args() {
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
@@ -46,13 +47,17 @@ declare_args() {
 # Indicates if the UI toolkit depends on X11.
 use_x11 = is_linux && !use_ozone
 
+# Indicates if the UI toolkit depends on GTK.
+use_gtk = use_x11 && !use_qt
+
 # Turn off glib if Ozone is enabled.
 if (use_ozone) {
   use_glib = false
 }
 
 # Whether to use atk, the Accessibility ToolKit library
-use_atk = is_desktop_linux && use_x11
+use_atk = is_desktop_linux && use_gtk
+
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================