Windows and macOS GN integration

Change-Id: I79925220265602bd0c39e5e03162cf1dca15befe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

5 files changed, 72 insertions, 17 deletions

diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index bee4ec0fe71..e86425db1f9 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -218,6 +218,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
@@ -427,7 +433,7 @@ config("compiler") {
     # things like which functions are considered deprecated.)
     cflags_cc += [ "-stdlib=libc++" ]
     ldflags += [ "-stdlib=libc++" ]
-    if (!is_component_build && !is_asan) {
+    if (!is_component_build && !is_asan && !use_qt) {
       ldflags += [
         "-L",
         rebase_path("//third_party/libc++-static", root_build_dir),
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 281c8b659d3..367eda4b227 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -505,14 +505,31 @@ source_set("browser") {
     configs += [ "//tools/ipc_fuzzer:ipc_fuzzer_config" ]
   }
 
-  if (use_qt && is_linux) {
-    sources -= [
-      "renderer_host/native_web_keyboard_event_aura.cc",
-      "renderer_host/render_widget_host_view_aura.cc",
-      "renderer_host/render_widget_host_view_aura.h",
-      "web_contents/web_contents_view_aura.h",
-      "web_contents/web_contents_view_aura.cc",
-    ]
+  if (use_qt) {
+    if (use_aura) {
+      sources -= [
+        "renderer_host/native_web_keyboard_event_aura.cc",
+        "renderer_host/render_widget_host_view_aura.cc",
+        "renderer_host/render_widget_host_view_aura.h",
+        "web_contents/web_contents_view_aura.h",
+        "web_contents/web_contents_view_aura.cc",
+      ]
+    } else if (is_mac) {
+      sources -= [
+        "accessibility/accessibility_tree_formatter_mac.mm",
+        "accessibility/browser_accessibility_cocoa.mm",
+        "accessibility/browser_accessibility_cocoa.h",
+        "accessibility/browser_accessibility_mac.mm",
+        "accessibility/browser_accessibility_mac.h",
+        "accessibility/browser_accessibility_manager_mac.mm",
+        "accessibility/browser_accessibility_manager_mac.h",
+        "renderer_host/native_web_keyboard_event_mac.mm",
+        "renderer_host/render_widget_host_view_mac.mm",
+        "renderer_host/render_widget_host_view_mac.h",
+        "web_contents/web_contents_view_mac.mm",
+        "web_contents/web_contents_view_mac.h",
+      ]
+    }
   }
 }
 
diff --git a/chromium/content/child/BUILD.gn b/chromium/content/child/BUILD.gn
index 636c47e881a..1ff3aedc5d5 100644
--- a/chromium/content/child/BUILD.gn
+++ b/chromium/content/child/BUILD.gn
@@ -76,6 +76,12 @@ source_set("child") {
     ]
   }
 
+  if (use_qt && is_mac) {
+    sources -= [
+      "webthemeengine_impl_mac.cc"
+    ]
+  }
+
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
diff --git a/chromium/third_party/WebKit/Source/build/scripts/scripts.gni b/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
index edb1937a579..2f1724f46de 100644
--- a/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
+++ b/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
@@ -62,8 +62,13 @@ make_trie_helpers_files =
 # The executables are relative to the build directory. Don't rebase it because
 # on Posix we want to run the system one on the path.
 if (host_os == "win") {
-  gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
-  bison_exe = rebase_path("//third_party/bison/bin/bison.exe", root_build_dir)
+  if (use_qt) {
+    gperf_exe = "gperf.exe"
+    bison_exe = "bison.exe"
+  } else {
+    gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
+    bison_exe = rebase_path("//third_party/bison/bin/bison.exe", root_build_dir)
+  }
 } else {
   gperf_exe = "gperf"
   bison_exe = "bison"
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index feef68ddfbd..4955ef4ef69 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -610,12 +610,33 @@ component("base") {
     sources -= [ "device_form_factor_desktop.cc" ]
   }
 
-  if (use_qt && is_linux) {
-   sources -= [
-     "resource/resource_bundle_auralinux.cc",
-     "dragdrop/os_exchange_data_provider_aurax11.cc",
-     "dragdrop/os_exchange_data_provider_aurax11.h",
-   ]
+  if (use_qt) {
+    if (is_linux) {
+      sources -= [
+        "resource/resource_bundle_auralinux.cc",
+        "dragdrop/os_exchange_data_provider_aurax11.cc",
+        "dragdrop/os_exchange_data_provider_aurax11.h",
+      ]
+    } else if (is_mac) {
+      sources -= [
+        "clipboard/clipboard_mac.mm",
+        "clipboard/clipboard_mac.h",
+        "dragdrop/os_exchange_data_provider_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.h",
+        "resource/resource_bundle_mac.mm",
+      ]
+    } else if (is_win) {
+      sources -= [
+        "clipboard/clipboard_util_win.cc",
+        "clipboard/clipboard_util_win.h",
+        "clipboard/clipboard_win.cc",
+        "clipboard/clipboard_win.h",
+        "dragdrop/os_exchange_data_provider_win.cc",
+        "dragdrop/os_exchange_data_provider_win.h",
+        "resource/resource_bundle_win.cc",
+        "resource/resource_bundle_win.h",
+      ]
+    }
   }
 }