Qt GN integration

- Exclude source files we override in the qt webengine sources.
- Add TOOLKIT_QT define for use_qt
- Add is_shared GN argument

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

51 files changed, 300 insertions, 114 deletions

diff --git a/chromium/.gn b/chromium/.gn
index d7bf70b254b..f4d80b81635 100644
--- a/chromium/.gn
+++ b/chromium/.gn
@@ -63,30 +63,6 @@ default_args = {
   devtools_visibility = [ "*" ]
 }
 
-# These are the targets to skip header checking by default. The files in targets
-# matching these patterns (see "gn help label_pattern" for format) will not have
-# their includes checked for proper dependencies when you run either
-# "gn check" or "gn gen --check".
-no_check_targets = [
-  # crbug.com/1158989
-  "//headless:headless_renderer",  # 12 errors
-  "//headless:headless_shared_sources",  # 2 errors
-
-  # //v8, https://crbug.com/v8/7330
-  "//v8/src/inspector:inspector",  # 20 errors
-  "//v8/test/cctest:cctest_sources",  # 15 errors
-  "//v8/test/unittests:inspector_unittests_sources",  # 2 errors
-  "//v8:cppgc_base",  # 1 error
-  "//v8:v8_internal_headers",  # 11 errors
-  "//v8:v8_libplatform",  # 2 errors
-
-  # After making partition_alloc a standalone library, remove partition_alloc
-  # target from the skip list, because partition_aloc will depend on its own
-  # base.
-  # partition alloc standalone library bug is https://crbug.com/1151236.
-  "//base/allocator/partition_allocator:partition_alloc",  # 292 errors
-]
-
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged.
diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index a6b18dea123..31e0c178477 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -57,6 +57,7 @@ declare_args() {
   # checkout to add additional targets without explicitly changing any checked-
   # in files.
   root_extra_deps = []
+  qtwebengine_target = "//tools/gn"
 }
 
 if (is_official_build) {
@@ -89,7 +90,7 @@ group("gn_all") {
     "//codelabs",
     "//components:components_unittests",
     "//components/gwp_asan:gwp_asan_unittests",
-    "//infra/orchestrator:orchestrator_all",
+#    "//infra/orchestrator:orchestrator_all",
     "//net:net_unittests",
     "//sandbox:sandbox_unittests",
     "//services:services_unittests",
@@ -125,7 +126,7 @@ group("gn_all") {
     ]
   }
 
-  if (!is_ios && !is_android && !is_castos) {
+  if (!is_ios && !is_android && !is_castos && !is_qtwebengine) {
     deps += [
       "//chrome",
       "//chrome/browser/ui/color:dump_colors",
@@ -172,11 +173,11 @@ group("gn_all") {
     ]
   }
 
-  if (!is_ios && !is_castos) {
+  if (!is_ios && !is_castos && !is_qtwebengine) {
     deps += [ "//chrome/test:unit_tests" ]
   }
 
-  if (!is_ios) {
+  if (!is_ios && !is_qtwebengine) {
     deps += [
       ":chromedriver",
       "//cc:cc_unittests",
@@ -218,7 +219,7 @@ group("gn_all") {
     ]
   }
 
-  if (!is_ios && !is_android) {
+  if ((!is_ios && !is_android) && !is_qtwebengine) {
     deps += [
       "//components/cronet:cronet_tests",
       "//components/cronet:cronet_unittests",
@@ -226,7 +227,7 @@ group("gn_all") {
     ]
   }
 
-  if (!is_ios) {
+  if (!is_ios && !is_qtwebengine) {
     deps += [
       "//google_apis/gcm:mcs_probe",
       "//media/cast:cast_unittests",
@@ -242,7 +243,7 @@ group("gn_all") {
         deps += [ "//chrome/test:telemetry_perf_unittests${_target_suffix}" ]
       }
     }
-  } else {
+  } else if (!is_qtwebengine) {
     deps += [
       "//ios:all",
       "//third_party/crashpad/crashpad:crashpad_tests",
@@ -468,7 +469,7 @@ group("gn_all") {
     deps += [ "//chromeos:chromeos_unittests" ]
   }
 
-  if (is_chromeos_ash || is_mac || is_win) {
+  if ((is_chromeos_ash || is_mac || is_win) && !is_qtwebengine) {
     deps += [
       "//rlz:rlz_id",
       "//rlz:rlz_lib",
@@ -523,7 +524,7 @@ group("gn_all") {
 
   # TODO(GYP): Figure out which of these should (and can) build
   # for Chrome OS and iOS.
-  if (!is_chromeos_ash && !is_ios) {
+  if (!is_chromeos_ash && !is_ios && !is_qtwebengine) {
     deps += [
       "//base:build_utf8_validator_tables",
       "//base:check_example",
@@ -595,7 +596,7 @@ group("gn_all") {
     ]
   }
 
-  if (is_android || is_linux || is_chromeos_lacros) {
+  if ((is_android || is_linux || is_chromeos_lacros) && !is_qtwebengine) {
     deps += [
       "//components/network_hints/browser",
       "//content/public/app",
@@ -677,7 +678,7 @@ group("gn_all") {
 
     # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
     if (!(is_component_build && is_debug && target_cpu == "x86") &&
-        host_os == "win") {
+        host_os == "win" && !is_qtwebengine) {
       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
     }
   } else if (!is_android && !is_ios && !is_fuchsia) {
@@ -941,7 +942,7 @@ if (is_fuchsia) {
 
 # TODO(GYP_GONE): Figure out if we really need this target or if there's
 # some better way to specify things.
-if (is_win) {
+if (is_win && !is_qtwebengine) {
   group("chrome_official_builder_no_unittests") {
     deps = [
       "//chrome/common/win:eventlog_provider",
@@ -1767,6 +1768,10 @@ if (enable_js_type_check) {
   }
 }
 
+group("qtwebengine") {
+    deps = [ qtwebengine_target ]
+}
+
 # Write debug logs to gn_logs.txt.
 _lines = [
            "Generated during 'gn gen' by //BUILD.gn.",
diff --git a/chromium/build/config/BUILD.gn b/chromium/build/config/BUILD.gn
index 265d4bc0701..da7282a1eb9 100644
--- a/chromium/build/config/BUILD.gn
+++ b/chromium/build/config/BUILD.gn
@@ -93,6 +93,10 @@ config("feature_flags") {
     defines += [ "OFFICIAL_BUILD" ]
   }
 
+  if (is_qtwebengine) {
+    defines += [ "TOOLKIT_QT" ]
+  }
+
   # ==============================================
   #   PLEASE DO NOT ADD MORE THINGS TO THIS LIST
   # ==============================================
diff --git a/chromium/build/config/BUILDCONFIG.gn b/chromium/build/config/BUILDCONFIG.gn
index 21b4055dc15..7eaab3c591e 100644
--- a/chromium/build/config/BUILDCONFIG.gn
+++ b/chromium/build/config/BUILDCONFIG.gn
@@ -168,6 +168,11 @@ declare_args() {
   is_component_build = is_debug && current_os != "ios"
 }
 
+declare_args() {
+  # Shared library build
+  is_shared = is_component_build
+}
+
 assert(!(is_debug && is_official_build), "Can't do official debug builds")
 assert(!(current_os == "ios" && is_component_build),
        "Can't use component build on iOS")
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 9ed31659cd6..40640a81090 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -23,6 +23,9 @@ import("//build/toolchain/rbe.gni")
 import("//build/toolchain/toolchain.gni")
 import("//build_overrides/build.gni")
 
+# Import features.gni for the "is_qtwebengine" argument to be available.
+import("//build/config/features.gni")
+
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
@@ -349,6 +352,12 @@ config("compiler") {
     }
   }
 
+  if (is_qtwebengine && 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
@@ -1323,7 +1332,7 @@ config("compiler_deterministic") {
   # Tells the compiler not to use absolute paths when passing the default
   # paths to the tools it invokes. We don't want this because we don't
   # really need it and it can mess up the goma cache entries.
-  if (is_clang && (!is_nacl || is_nacl_saigo) && !(use_qt && use_libcxx)) {
+  if (is_clang && (!is_nacl || is_nacl_saigo) && !(is_qtwebengine && use_libcxx)) {
     cflags += [ "-no-canonical-prefixes" ]
 
     # Same for links: Let the compiler driver invoke the linker
diff --git a/chromium/build/config/features.gni b/chromium/build/config/features.gni
index 4cc9cb5e95f..93960c355a5 100644
--- a/chromium/build/config/features.gni
+++ b/chromium/build/config/features.gni
@@ -16,6 +16,7 @@
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
+import("//ui/qt/qt.gni")
 
 declare_args() {
   # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
diff --git a/chromium/build/config/linux/gtk/gtk.gni b/chromium/build/config/linux/gtk/gtk.gni
index 9e6131d4c0a..64977c5e7db 100644
--- a/chromium/build/config/linux/gtk/gtk.gni
+++ b/chromium/build/config/linux/gtk/gtk.gni
@@ -6,7 +6,7 @@ import("//build/config/ui.gni")
 
 declare_args() {
   # Whether or not we should use libgtk.
-  use_gtk = is_linux && !is_castos
+  use_gtk = is_linux && !is_castos && !is_qtwebengine
 
   # The (major) version of GTK to build against.  A different version may be
   # loaded at runtime.
diff --git a/chromium/build/config/linux/pangocairo/pangocairo.gni b/chromium/build/config/linux/pangocairo/pangocairo.gni
index c7662ac3335..4e4734cd8c4 100644
--- a/chromium/build/config/linux/pangocairo/pangocairo.gni
+++ b/chromium/build/config/linux/pangocairo/pangocairo.gni
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/chromeos/ui_mode.gni")
-import("//build/config/ui.gni")
+import("//build/config/linux/gtk/gtk.gni")
 
 declare_args() {
-  use_pangocairo = is_linux && !is_castos
+  use_pangocairo = use_gtk
 }
diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index b560f372c63..6faa44dbc40 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -20,6 +20,7 @@
 import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/args.gni")
 import("//build/config/chromeos/ui_mode.gni")
+import("//build/config/features.gni")
 import("//build/config/ozone.gni")
 
 declare_args() {
@@ -41,13 +42,14 @@ declare_args() {
 
 assert(!use_glib || (is_linux && !is_castos))
 
-use_atk = use_glib && current_toolchain == default_toolchain
+use_atk = use_glib && current_toolchain == default_toolchain && !is_qtwebengine
 
 # Whether using Xvfb to provide a display server for a test might be
 # necessary.
 use_xvfb_in_this_config =
     is_linux || (is_chromeos_lacros && !is_chromeos_device)
 #
+
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index 5b6a4abdd0d..526b8afc130 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -459,7 +459,7 @@ config("delayloads_not_for_child_dll") {
 # See https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx for a reference of
 # what each value does.
 config("default_crt") {
-  if (is_component_build) {
+  if (is_shared) {
     # Component mode: dynamic CRT. Since the library is shared, it requires
     # exceptions or will give errors about things not matching, so keep
     # exceptions on.
diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn
index 6af6b725815..2e0a6790530 100644
--- a/chromium/chrome/browser/BUILD.gn
+++ b/chromium/chrome/browser/BUILD.gn
@@ -5951,7 +5951,6 @@ static_library("browser") {
       "install_verification/win/module_list.h",
       "install_verification/win/module_verification_common.cc",
       "install_verification/win/module_verification_common.h",
-      "media/webrtc/window_icon_util_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.h",
       "media_galleries/win/mtp_device_object_entry.cc",
diff --git a/chromium/chrome/browser/ui/BUILD.gn b/chromium/chrome/browser/ui/BUILD.gn
index 847e3c7baf8..e3fb5d3fd35 100644
--- a/chromium/chrome/browser/ui/BUILD.gn
+++ b/chromium/chrome/browser/ui/BUILD.gn
@@ -5890,7 +5890,7 @@ static_library("test_support") {
     "//ui/shell_dialogs",
   ]
 
-  if (is_mac) {
+  if (is_mac && toolkit_views) {
     assert(toolkit_views)
     sources += [
       "cocoa/test/cocoa_test_helper.h",
diff --git a/chromium/chrome/chrome_repack_locales.gni b/chromium/chrome/chrome_repack_locales.gni
index adc881122cb..d55f4ad3368 100644
--- a/chromium/chrome/chrome_repack_locales.gni
+++ b/chromium/chrome/chrome_repack_locales.gni
@@ -120,5 +120,17 @@ template("chrome_repack_locales") {
     if (defined(invoker.additional_source_patterns)) {
       source_patterns += invoker.additional_source_patterns
     }
+
+    if (is_qtwebengine) {
+      source_patterns -= [
+        "${root_gen_dir}/components/omnibox/resources/omnibox_pedal_synonyms_",
+        "${root_gen_dir}/components/omnibox/resources/omnibox_resources_",
+      ]
+
+      deps -= [
+        "//components/omnibox/resources:omnibox_pedal_synonyms",
+        "//components/omnibox/resources:omnibox_resources",
+      ]
+    }
   }
 }
diff --git a/chromium/chrome/common/features.gni b/chromium/chrome/common/features.gni
index b1a0c384b0c..fbf5525e77f 100644
--- a/chromium/chrome/common/features.gni
+++ b/chromium/chrome/common/features.gni
@@ -47,7 +47,7 @@ declare_args() {
   enable_basic_print_dialog = enable_basic_printing && !is_chromeos
 
   # Enables usage of notifications via Chrome's MessageCenter.
-  enable_chrome_notifications = is_mac || is_win || is_linux || is_fuchsia
+  enable_chrome_notifications = enable_message_center && (is_mac || is_win || is_linux || is_fuchsia)
 
   # Disable Click to Call on Fuchsia.
   enable_click_to_call = !is_fuchsia
diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn
index 6e30d38a046..2171db39ea1 100644
--- a/chromium/chrome/installer/setup/BUILD.gn
+++ b/chromium/chrome/installer/setup/BUILD.gn
@@ -48,7 +48,7 @@ if (is_win) {
       "//components/crash/core/app:crash_export_thunks",
       "//components/crash/core/app:run_as_crashpad_handler",
       "//content/public/common:static_switches",
-      "//rlz:rlz_lib_no_network",
+#      "//rlz:rlz_lib_no_network",
       "//url",
     ]
 
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index 1c660e23fbf..8d1e23dec9c 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -1273,7 +1273,6 @@ if (!is_android) {
       "//chrome/browser/web_applications:browser_tests",
       "//chrome/browser/web_applications:web_applications_test_support",
       "//chrome/browser/web_applications/extensions",
-      "//chrome/browser/webaudio:browser_tests",
       "//chrome/common:version_header",
       "//chrome/common/privacy_budget:test_support",
       "//chrome/renderer",
@@ -3258,11 +3257,11 @@ if (!is_android) {
           "//media/test/data/id3_png_test.mp3",
         ]
       }
-
       deps += [
         "//build:chromeos_buildflags",
         "//chrome/browser/devtools:test_support",
         "//chrome/browser/extensions:test_support",
+        "//chrome/browser/web_applications:browser_tests",
         "//chrome/common/extensions/api",
         "//chrome/services/media_gallery_util/public/cpp:browser_tests",
         "//components/content_settings/core/test:test_support",
@@ -9383,7 +9382,7 @@ if (!is_android) {
   }
 }
 
-if (!is_android) {
+if (!is_android && !is_qtwebengine) {
   test("interactive_ui_tests") {
     use_xvfb = use_xvfb_in_this_config
 
@@ -11178,7 +11177,7 @@ if (is_chromeos_ash) {
   }
 }
 
-if (is_linux || is_mac || is_win) {
+if ((is_linux || is_mac || is_win) && !is_qtwebengine) {
   script_test("variations_smoke_tests") {
     if (is_linux) {
       script = "//testing/xvfb.py"
diff --git a/chromium/chrome/tools/convert_dict/BUILD.gn b/chromium/chrome/tools/convert_dict/BUILD.gn
index d0d2bbb3308..caef30a066c 100644
--- a/chromium/chrome/tools/convert_dict/BUILD.gn
+++ b/chromium/chrome/tools/convert_dict/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/features.gni")
 
 source_set("lib") {
 
-  if (!use_qt) {
+  if (!is_qtwebengine) {
     # Production code shouldn't be depending on this.
     testonly = true
   }
diff --git a/chromium/components/proxy_config/BUILD.gn b/chromium/components/proxy_config/BUILD.gn
index a8bc0e3796a..e612d2c6e07 100644
--- a/chromium/components/proxy_config/BUILD.gn
+++ b/chromium/components/proxy_config/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chromeos/ui_mode.gni")
+import("//build/config/features.gni")
 
 component("proxy_config") {
   sources = [
@@ -23,9 +24,6 @@ component("proxy_config") {
 
   deps = [
     "//base",
-    "//components/policy:generated",
-    "//components/policy/core/browser",
-    "//components/policy/core/common",
     "//components/prefs",
     "//components/strings",
     "//net",
@@ -42,11 +40,16 @@ component("proxy_config") {
     deps += [ "//components/pref_registry" ]
   }
 
-  if (!is_ios) {
+  if (!is_ios && !is_qtwebengine) {
     sources += [
       "proxy_policy_handler.cc",
       "proxy_policy_handler.h",
     ]
+    deps += [
+      "//components/policy:generated",
+      "//components/policy/core/browser",
+      "//components/policy/core/common",
+    ]
   }
 }
 
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn
index d7da06953e4..5b5229c2eab 100644
--- a/chromium/components/resources/BUILD.gn
+++ b/chromium/components/resources/BUILD.gn
@@ -73,7 +73,7 @@ grit("dev_ui_components_resources") {
 
   deps = [
     "//components/local_state:build",
-    "//components/policy/resources/webui:html_wrapper_files",
+#    "//components/policy/resources/webui:html_wrapper_files",
   ]
   output_dir = "$root_gen_dir/components"
 }
diff --git a/chromium/components/viz/service/gl/gpu_service_impl.cc b/chromium/components/viz/service/gl/gpu_service_impl.cc
index eedd5aaa15c..e14d2e30b7a 100644
--- a/chromium/components/viz/service/gl/gpu_service_impl.cc
+++ b/chromium/components/viz/service/gl/gpu_service_impl.cc
@@ -405,7 +405,7 @@ GpuServiceImpl::GpuServiceImpl(
   }
 #endif
 
-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) && !defined(TOOLKIT_QT)
   if (media::SupportMediaFoundationClearPlayback()) {
     // Initialize the OverlayStateService using the GPUServiceImpl task
     // sequence.
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index cd5fc5b4fc9..f8ca3250719 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -2594,8 +2594,6 @@ source_set("browser") {
   if (is_mac) {
     frameworks += [ "AppKit.framework" ]
     sources += [
-      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.h",
-      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm",
       "font_access/font_enumeration_data_source_mac.h",
       "font_access/font_enumeration_data_source_mac.mm",
       "gpu/ca_transaction_gpu_coordinator.cc",
@@ -3108,7 +3106,7 @@ source_set("browser") {
     ]
   }
 
-  if (is_mac && !use_qt) {
+  if (is_mac && !is_qtwebengine) {
     deps += [
       "//media",
       "//third_party/mozilla",
@@ -3131,6 +3129,8 @@ source_set("browser") {
       "../app_shim_remote_cocoa/render_widget_host_view_cocoa.mm",
       "../app_shim_remote_cocoa/sharing_service_picker.h",
       "../app_shim_remote_cocoa/sharing_service_picker.mm",
+      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.h",
+      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm",
       "../app_shim_remote_cocoa/web_contents_occlusion_checker_mac.h",
       "../app_shim_remote_cocoa/web_contents_occlusion_checker_mac.mm",
       "../app_shim_remote_cocoa/web_contents_view_cocoa.h",
@@ -3155,7 +3155,7 @@ source_set("browser") {
     ]
   }
 
-  if (use_aura) {
+  if (use_aura && !is_qtwebengine) {
     deps += [
       "//ui/aura",
       "//ui/aura_extra",
@@ -3288,6 +3288,54 @@ source_set("browser") {
       "screenlock_monitor/screenlock_monitor_device_source_lacros.cc",
     ]
   }
+
+  if (is_qtwebengine) {
+    if (is_win) {
+      sources -= [
+        "accessibility/browser_accessibility_com_win.cc",
+        "accessibility/browser_accessibility_com_win.h",
+        "accessibility/browser_accessibility_manager_win.cc",
+        "accessibility/browser_accessibility_manager_win.h",
+        "accessibility/browser_accessibility_win.cc",
+        "accessibility/browser_accessibility_win.h",
+        "accessibility/accessibility_tree_formatter_win.cc",
+        "renderer_host/legacy_render_widget_host_win.cc",
+        "renderer_host/legacy_render_widget_host_win.h"
+      ]
+    }
+    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/input/synthetic_gesture_target_mac.h",
+        "renderer_host/input/synthetic_gesture_target_mac.mm",
+        "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",
+        "web_contents/web_drag_dest_mac.h",
+        "web_contents/web_drag_dest_mac.mm",
+        "../app_shim_remote_cocoa/web_drag_source_mac.h",
+        "../app_shim_remote_cocoa/web_drag_source_mac.mm",
+      ]
+      deps -= [
+        "//components/remote_cocoa/app_shim",
+        "//components/remote_cocoa/browser",
+        "//components/remote_cocoa/common:mojo",
+       ]
+    }
+    if (use_aura) {
+      sources += [
+        "media/desktop_media_window_registry_aura.cc",
+      ]
+    }
+  }
 }
 
 if (is_android) {
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index bcc0a45f9b9..1f4959f91c8 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -362,7 +362,6 @@ source_set("common") {
     deps += [
       ":sandbox_support_linux",
       ":set_process_title_linux",
-      "//third_party/fontconfig",
     ]
   }
 
@@ -373,8 +372,10 @@ source_set("common") {
     ]
   }
 
-  if (is_mac || is_win || is_android || is_fuchsia) {
+  if (is_mac || is_win || is_android || is_fuchsia || is_qtwebengine) {
     sources -= [ "font_list_fontconfig.cc" ]
+  } else {
+    deps += [ "//third_party/fontconfig" ]
   }
 
   if (enable_ppapi) {
diff --git a/chromium/content/common/font_list_win.cc b/chromium/content/common/font_list_win.cc
index f94de4968e5..01efbf58918 100644
--- a/chromium/content/common/font_list_win.cc
+++ b/chromium/content/common/font_list_win.cc
@@ -18,6 +18,7 @@
 
 namespace content {
 
+#if !defined(TOOLKIT_QT)
 base::Value::List GetFontList_SlowBlocking() {
   TRACE_EVENT0("fonts", "GetFontList_SlowBlocking");
 
@@ -68,5 +69,6 @@ base::Value::List GetFontList_SlowBlocking() {
 
   return font_list;
 }
+#endif
 
 }  // namespace content
diff --git a/chromium/gpu/ipc/service/gpu_init.cc b/chromium/gpu/ipc/service/gpu_init.cc
index 31b0d2e5bf0..fa270af656a 100644
--- a/chromium/gpu/ipc/service/gpu_init.cc
+++ b/chromium/gpu/ipc/service/gpu_init.cc
@@ -54,7 +54,7 @@
 #include "ui/ozone/public/surface_factory_ozone.h"
 #endif
 
-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) && !defined(TOOLKIT_QT)
 #include "gpu/config/gpu_driver_bug_workarounds.h"
 #include "ui/gl/direct_composition_support.h"
 #include "ui/gl/gl_surface_egl.h"
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 852c12a5c15..b5b58ef355f 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -508,7 +508,7 @@ static_library("common") {
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
-    if (is_linux) {
+    if (use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
   } else if (remoting_use_wayland && is_linux) {
@@ -1055,7 +1055,7 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (is_linux || is_chromeos_lacros) {
+    if (use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
     if (is_linux || is_chromeos_lacros || is_mac) {
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index a33ef931759..bd9e68240bf 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -93,7 +93,7 @@ source_set("common") {
     "//services/network/public/cpp:cpp",
   ]
 
-  if (is_linux) {
+  if (use_gtk) {
     deps += [
       "//build/config/linux/gtk",
       "//ui/base:base",
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index bb05076fd89..78b928cc272 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -150,7 +150,7 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash &&
       "//remoting/host:resources",
     ]
 
-    if ((is_linux || is_chromeos_lacros) && remoting_use_x11) {
+    if (use_gtk && remoting_use_x11) {
       deps += [
         "//build/config/linux/gtk",
         "//ui/events/platform/x11:x11",
diff --git a/chromium/third_party/blink/renderer/BUILD.gn b/chromium/third_party/blink/renderer/BUILD.gn
index 6d140b8974b..a5c45ce2d17 100644
--- a/chromium/third_party/blink/renderer/BUILD.gn
+++ b/chromium/third_party/blink/renderer/BUILD.gn
@@ -41,6 +41,16 @@ config("inside_blink") {
     "BLINK_IMPLEMENTATION=1",
     "INSIDE_BLINK",
   ]
+  if (is_clang || !is_win) {
+    cflags += [
+      "-Wno-unused-variable",
+    ]
+  } else {
+    cflags += [
+      "/wd4101",
+      "/wd4805",
+    ]
+  }
   if (is_clang) {
     cflags += [
       "-Wconversion",
diff --git a/chromium/third_party/blink/renderer/build/scripts/scripts.gni b/chromium/third_party/blink/renderer/build/scripts/scripts.gni
index 54fa152f4ca..38fda4f10e6 100644
--- a/chromium/third_party/blink/renderer/build/scripts/scripts.gni
+++ b/chromium/third_party/blink/renderer/build/scripts/scripts.gni
@@ -71,8 +71,12 @@ 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)
-} else if (host_os == "mac") {
+  if (is_qtwebengine) {
+    gperf_exe = "gperf.exe"
+  } else {
+    gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
+  }
+} else if (host_os == "mac" && !is_qtwebengine) {
   # TODO(thakis): This should probably run in the host toolchain and check
   # is_mac instead of checking host_os.
   gperf_exe = mac_bin_path + "gperf"
diff --git a/chromium/third_party/devtools-frontend/src/test/BUILD.gn b/chromium/third_party/devtools-frontend/src/test/BUILD.gn
index c5402469e78..2d055aa3f3e 100644
--- a/chromium/third_party/devtools-frontend/src/test/BUILD.gn
+++ b/chromium/third_party/devtools-frontend/src/test/BUILD.gn
@@ -6,15 +6,15 @@ import("../scripts/build/ninja/copy.gni")
 
 group("test") {
   deps = [
-    ":config",
-    "e2e",
-    "interactions",
-    "perf",
-    "shared",
-    "unittests",
+#    ":config",
+#    "e2e",
+#    "interactions",
+#    "perf",
+#    "shared",
+#    "unittests",
   ]
 }
 
-copy_to_gen("config") {
-  sources = [ "base-mocharc.js" ]
-}
+#copy_to_gen("config") {
+#  sources = [ "base-mocharc.js" ]
+#}
diff --git a/chromium/third_party/libyuv/BUILD.gn b/chromium/third_party/libyuv/BUILD.gn
index 7db80d44820..e546714152d 100644
--- a/chromium/third_party/libyuv/BUILD.gn
+++ b/chromium/third_party/libyuv/BUILD.gn
@@ -55,7 +55,7 @@ group("libyuv") {
   all_dependent_configs = [ ":libyuv_config" ]
   deps = []
 
-  if (is_win && target_cpu == "x64" && !use_qt) {
+  if (is_win && target_cpu == "x64" && !is_qtwebengine) {
     # Compile with clang in order to get inline assembly
     public_deps = [ ":libyuv_internal(//build/toolchain/win:win_clang_x64)" ]
   } else {
diff --git a/chromium/third_party/webrtc/examples/BUILD.gn b/chromium/third_party/webrtc/examples/BUILD.gn
index e683c192dc8..1ef822cb21e 100644
--- a/chromium/third_party/webrtc/examples/BUILD.gn
+++ b/chromium/third_party/webrtc/examples/BUILD.gn
@@ -742,7 +742,9 @@ if (is_linux || is_chromeos || is_win) {
         "Xext",
         "Xrender",
       ]
-      configs += [ ":gtk_config" ]
+      if (use_gtk) {
+        configs += [ ":gtk_config" ]
+      }
     }
 
     deps += [
diff --git a/chromium/tools/grit/grit_args.gni b/chromium/tools/grit/grit_args.gni
index a60843bab98..b3485588af2 100644
--- a/chromium/tools/grit/grit_args.gni
+++ b/chromium/tools/grit/grit_args.gni
@@ -14,8 +14,8 @@ devtools_grd_path_no_ext = get_path_info(devtools_grd_path, "dir") + "/" +
 
 # Prefer using this (and excluding specific platforms) when a resource applies
 # to (most) desktop platforms.
-assert(toolkit_views ==
-       (is_chromeos || is_fuchsia || is_linux || is_mac || is_win))
+#assert(toolkit_views ==
+#       (is_chromeos || is_fuchsia || is_linux || is_mac || is_win))
 
 # Variables that are passed to grit with the -D flag.
 
diff --git a/chromium/ui/accessibility/platform/BUILD.gn b/chromium/ui/accessibility/platform/BUILD.gn
index 029fa1010dd..6ce506e745a 100644
--- a/chromium/ui/accessibility/platform/BUILD.gn
+++ b/chromium/ui/accessibility/platform/BUILD.gn
@@ -96,6 +96,12 @@ source_set("platform") {
     "//ui/base:buildflags",
     "//ui/display",
   ]
+  if (is_win) {
+    public_deps += [
+      "//third_party/iaccessible2",
+      "//ui/accessibility/platform:ichromeaccessible",
+    ]
+  }
 
   if (enable_extensions) {
     sources += [
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index 3d74c126c9a..e737b9bc5a2 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -589,7 +589,7 @@ component("base") {
     ]
   }
 
-  if (is_mac || is_win) {
+  if ((is_mac || is_win) && !is_qtwebengine) {
     deps += [ "//ui/base/clipboard" ]
   }
 
@@ -642,6 +642,37 @@ component("base") {
   if (is_android || is_ios) {
     sources -= [ "device_form_factor_desktop.cc" ]
   }
+
+  if (is_qtwebengine) {
+    if (toolkit_views || use_aura) {
+      sources -= [
+        "dragdrop/os_exchange_data_provider_factory.cc",
+        "dragdrop/os_exchange_data_provider_factory.h",
+      ]
+    }
+    if (is_linux) {
+      sources -= [
+        "resource/resource_bundle_auralinux.cc",
+      ]
+    } else if (is_mac) {
+      sources -= [
+        "dragdrop/os_exchange_data_provider_builder_mac.h",
+        "dragdrop/os_exchange_data_provider_builder_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.h",
+        "resource/resource_bundle_mac.mm",
+      ]
+    } else if (is_win) {
+      sources -= [
+        "dragdrop/drag_source_win.cc",
+        "dragdrop/drag_source_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",
+      ]
+    }
+  }
 }
 
 if (is_ios) {
diff --git a/chromium/ui/base/clipboard/BUILD.gn b/chromium/ui/base/clipboard/BUILD.gn
index 9c28b9b12a3..dc1c064255c 100644
--- a/chromium/ui/base/clipboard/BUILD.gn
+++ b/chromium/ui/base/clipboard/BUILD.gn
@@ -18,11 +18,11 @@ component("clipboard_types") {
     sources += [ "clipboard_format_type.h" ]
   }
 
-  if (is_android) {
+  if (is_android && !is_qtwebengine) {
     sources += [ "clipboard_format_type_android.cc" ]
   }
 
-  if (is_mac) {
+  if (is_mac && !is_qtwebengine) {
     sources += [ "clipboard_format_type_mac.mm" ]
   }
 
@@ -30,11 +30,11 @@ component("clipboard_types") {
     sources += [ "clipboard_constants_mac.mm" ]
   }
 
-  if (is_win) {
+  if (is_win && !is_qtwebengine) {
     sources += [ "clipboard_format_type_win.cc" ]
   }
 
-  if (use_aura && !is_win) {
+  if (use_aura && (!is_win || is_qtwebengine)) {
     sources += [ "clipboard_format_type_aura.cc" ]
   }
 
@@ -43,10 +43,10 @@ component("clipboard_types") {
   deps = [ "//base" ]
 
   frameworks = []
-  if (is_apple) {
+  if (is_apple && !is_qtwebengine) {
     frameworks += [ "Foundation.framework" ]
   }
-  if (is_mac) {
+  if (is_mac && !is_qtwebengine) {
     frameworks += [ "AppKit.framework" ]
   }
 }
@@ -83,7 +83,7 @@ component("clipboard") {
     "scoped_clipboard_writer.h",
   ]
 
-  if (is_android) {
+  if (is_android && !is_qtwebengine) {
     sources += [
       "clipboard_android.cc",
       "clipboard_android.h",
@@ -99,7 +99,7 @@ component("clipboard") {
     ]
   }
 
-  if (is_win) {
+  if (is_win && !is_qtwebengine) {
     sources += [
       "clipboard_util_win.cc",
       "clipboard_util_win.h",
@@ -127,7 +127,7 @@ component("clipboard") {
     "//ui/base/data_transfer_policy",
   ]
 
-  if (use_aura) {
+  if (use_aura && !is_qtwebengine) {
     if (use_ozone) {
       sources += [
         "clipboard_data.cc",
@@ -149,13 +149,16 @@ component("clipboard") {
     deps += [ "//ui/base:ui_base_jni_headers" ]
   }
 
-  if (is_mac) {
+  if (is_mac && !is_qtwebengine) {
     deps += [ "//third_party/mozilla" ]
     frameworks = [
       "AppKit.framework",
       "CoreFoundation.framework",
     ]
   }
+  if (is_qtwebengine && is_mac) {
+    sources -= [ "clipboard_mac.h", "clipboard_mac.mm" ]
+  }
 }
 
 source_set("clipboard_test_support") {
diff --git a/chromium/ui/base/clipboard/clipboard_format_type.h b/chromium/ui/base/clipboard/clipboard_format_type.h
index ea51898e4a5..6e98ca41636 100644
--- a/chromium/ui/base/clipboard/clipboard_format_type.h
+++ b/chromium/ui/base/clipboard/clipboard_format_type.h
@@ -108,8 +108,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   // Returns a human-readable format name, or an empty string as an error value
   // if the format isn't found.
   std::string GetName() const;
-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) && !defined(TOOLKIT_QT)
   const FORMATETC& ToFormatEtc() const { return *ChromeToWindowsType(&data_); }
+#elif defined(TOOLKIT_QT)
+  const std::string& ToString() const { return data_; }
 #elif BUILDFLAG(IS_APPLE)
   NSString* ToNSString() const { return data_; }
   // Custom copy and assignment constructor to handle NSString.
@@ -134,7 +136,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   //
   // In all platforms, format names may be ASCII or UTF8/16.
   // TODO(huangdarwin): Convert interfaces to std::u16string.
-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) && !defined(TOOLKIT_QT)
   // When there are multiple files in the data store and they are described
   // using a file group descriptor, the file contents are retrieved by
   // requesting the CFSTR_FILECONTENTS clipboard format type and also providing
@@ -146,7 +148,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   // FORMATETC:
   // https://docs.microsoft.com/en-us/windows/desktop/com/the-formatetc-structure
   CHROME_FORMATETC data_;
-#elif defined(USE_AURA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+#elif defined(USE_AURA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || defined(TOOLKIT_QT)
   explicit ClipboardFormatType(const std::string& native_format);
   std::string data_;
 #elif BUILDFLAG(IS_APPLE)
diff --git a/chromium/ui/base/ui_features.gni b/chromium/ui/base/ui_features.gni
index 61e5289a614..9e9781134c3 100644
--- a/chromium/ui/base/ui_features.gni
+++ b/chromium/ui/base/ui_features.gni
@@ -36,4 +36,4 @@ declare_args() {
 # BrowserAccessibilityManager. But unlike Windows, Mac and Linux it does not use
 # AXPlatformNode to implement a native C++ API, instead it bridges to a Java API.
 has_platform_accessibility_support =
-    has_native_accessibility || is_android || is_fuchsia || use_qt
+    has_native_accessibility || is_android || is_fuchsia || is_qtwebengine
diff --git a/chromium/ui/gfx/BUILD.gn b/chromium/ui/gfx/BUILD.gn
index 0ac0e60c43c..01417b4ee7e 100644
--- a/chromium/ui/gfx/BUILD.gn
+++ b/chromium/ui/gfx/BUILD.gn
@@ -580,7 +580,7 @@ source_set("memory_buffer_sources") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_linux || is_chromeos) {
+  if ((is_linux || is_chromeos) && !is_qtwebengine) {
     sources += [
       "linux/client_native_pixmap_dmabuf.cc",
       "linux/client_native_pixmap_dmabuf.h",
diff --git a/chromium/ui/gfx/ipc/BUILD.gn b/chromium/ui/gfx/ipc/BUILD.gn
index 83f5cd0b14d..fd1fd29377a 100644
--- a/chromium/ui/gfx/ipc/BUILD.gn
+++ b/chromium/ui/gfx/ipc/BUILD.gn
@@ -23,8 +23,10 @@ component("ipc") {
     "//ui/gfx/range",
   ]
 
-  frameworks = [
-    "CoreFoundation.framework",
-    "IOSurface.framework",
-  ]
+  if (is_mac) {
+    frameworks = [
+      "CoreFoundation.framework",
+      "IOSurface.framework",
+    ]
+  }
 }
diff --git a/chromium/ui/gfx/mojom/BUILD.gn b/chromium/ui/gfx/mojom/BUILD.gn
index bb22c70ae83..4e2de81a431 100644
--- a/chromium/ui/gfx/mojom/BUILD.gn
+++ b/chromium/ui/gfx/mojom/BUILD.gn
@@ -449,8 +449,10 @@ component("shared_mojom_traits") {
   if (use_ozone) {
     public_deps += [ "//ui/ozone:buildflags" ]
   }
-  frameworks = [
-    "CoreFoundation.framework",
-    "IOSurface.framework",
-  ]
+  if (is_apple) {
+    frameworks = [
+      "CoreFoundation.framework",
+      "IOSurface.framework",
+    ]
+  }
 }
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index 1cc665bf122..4c6ddc37e67 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -276,7 +276,7 @@ component("gl") {
     }
   }
 
-  if (ozone_platform_x11) {
+  if (ozone_platform_x11 && !is_qtwebengine) {
     sources += [
       "gl_image_egl_pixmap.cc",
       "gl_image_egl_pixmap.h",
@@ -316,12 +316,17 @@ component("gl") {
       "gl_image_glx.h",
       "gl_image_glx_native_pixmap.cc",
       "gl_image_glx_native_pixmap.h",
-      "gl_surface_glx.cc",
-      "gl_surface_glx.h",
       "glx_util.cc",
       "glx_util.h",
     ]
 
+    if (!is_qtwebengine) {
+      sources += [
+        "gl_surface_glx.cc",
+        "gl_surface_glx.h",
+      ]
+    }
+
     deps += [
       "//ui/base/x",
       "//ui/gfx/x",
@@ -439,6 +444,39 @@ component("gl") {
   if (is_linux) {
     deps += [ "//third_party/angle:angle_gpu_info_util" ]
   }
+
+  if (is_qtwebengine) {
+    if (use_egl) {
+      data_deps -= [
+        "//third_party/angle:libEGL",
+        "//third_party/angle:libGLESv2",
+      ]
+    }
+    if (is_win) {
+      sources -= [
+        "dc_layer_tree.cc",
+        "dc_layer_tree.h",
+        "direct_composition_child_surface_win.cc",
+        "direct_composition_child_surface_win.h",
+        "direct_composition_surface_win.cc",
+        "direct_composition_surface_win.h",
+        "swap_chain_presenter.cc",
+        "swap_chain_presenter.h",
+      ]
+    }
+    if (is_linux || is_win) {
+      sources -= [
+        "gl_surface_egl.cc",
+        "gl_surface_egl.h",
+      ]
+    }
+    if (is_linux && ozone_platform_x11) {
+      sources += [
+        "gl_image_egl_pixmap.cc",
+        "gl_image_egl_pixmap.h",
+      ]
+    }
+  }
 }
 
 if (is_mac && use_egl) {
diff --git a/chromium/ui/gl/gl_display.cc b/chromium/ui/gl/gl_display.cc
index 8faf33aeac4..051ed0ed0d2 100644
--- a/chromium/ui/gl/gl_display.cc
+++ b/chromium/ui/gl/gl_display.cc
@@ -754,6 +754,7 @@ void GLDisplayEGL::SetDisplay(EGLDisplay display) {
   display_ = display;
 }
 
+#if !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC)
 EGLDisplayPlatform GLDisplayEGL::GetNativeDisplay() const {
   return native_display_;
 }
@@ -1020,6 +1021,7 @@ void GLDisplayEGL::InitializeCommon() {
 #endif  // BUILDFLAG(IS_ANDROID)
 }
 #endif  // defined(USE_EGL)
+#endif // !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC)
 
 #if defined(USE_GLX)
 GLDisplayX11::GLDisplayX11(uint64_t system_device_id)
diff --git a/chromium/ui/gl/init/gl_factory_ozone.cc b/chromium/ui/gl/init/gl_factory_ozone.cc
index 4ec5b03ee17..1e31a074f95 100644
--- a/chromium/ui/gl/init/gl_factory_ozone.cc
+++ b/chromium/ui/gl/init/gl_factory_ozone.cc
@@ -31,6 +31,7 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
              : false;
 }
 
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -108,6 +109,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
   }
   return nullptr;
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   if (HasGLOzone()) {
diff --git a/chromium/ui/gl/init/gl_factory_win.cc b/chromium/ui/gl/init/gl_factory_win.cc
index cebb6f40a2a..cbe7bd9d6f9 100644
--- a/chromium/ui/gl/init/gl_factory_win.cc
+++ b/chromium/ui/gl/init/gl_factory_win.cc
@@ -36,7 +36,7 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
       return false;
   }
 }
-
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -103,6 +103,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
       return nullptr;
   }
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   GLImplementation implementation = GetGLImplementation();
diff --git a/chromium/ui/gl/init/gl_initializer_ozone.cc b/chromium/ui/gl/init/gl_initializer_ozone.cc
index 345f94e8552..1b10cc7bce4 100644
--- a/chromium/ui/gl/init/gl_initializer_ozone.cc
+++ b/chromium/ui/gl/init/gl_initializer_ozone.cc
@@ -20,6 +20,7 @@
 namespace gl {
 namespace init {
 
+#if !defined(TOOLKIT_QT)
 GLDisplay* InitializeGLOneOffPlatform(uint64_t system_device_id) {
   if (HasGLOzone()) {
     gl::GLDisplayEglUtil::SetInstance(gl::GLDisplayEglUtilOzone::GetInstance());
@@ -35,6 +36,7 @@ GLDisplay* InitializeGLOneOffPlatform(uint64_t system_device_id) {
   }
   return nullptr;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementationParts implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
diff --git a/chromium/ui/gl/init/gl_initializer_win.cc b/chromium/ui/gl/init/gl_initializer_win.cc
index 1d627a87521..9001823e915 100644
--- a/chromium/ui/gl/init/gl_initializer_win.cc
+++ b/chromium/ui/gl/init/gl_initializer_win.cc
@@ -123,6 +123,7 @@ bool InitializeStaticEGLInternal(GLImplementationParts implementation) {
 
 }  // namespace
 
+#if !defined(TOOLKIT_QT)
 GLDisplay* InitializeGLOneOffPlatform(uint64_t system_device_id) {
   VSyncProviderWin::InitializeOneOff();
 
@@ -143,6 +144,7 @@ GLDisplay* InitializeGLOneOffPlatform(uint64_t system_device_id) {
   }
   return display;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementationParts implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
diff --git a/chromium/ui/ozone/common/BUILD.gn b/chromium/ui/ozone/common/BUILD.gn
index 42207f44a61..18256cd08bf 100644
--- a/chromium/ui/ozone/common/BUILD.gn
+++ b/chromium/ui/ozone/common/BUILD.gn
@@ -36,6 +36,13 @@ source_set("common") {
     "//ui/ozone:ozone_base",
   ]
 
+  if (is_qtwebengine) {
+    sources -= [
+      "gl_surface_egl_readback.cc",
+      "gl_surface_egl_readback.h",
+    ]
+  }
+
   deps = [
     "//build:chromeos_buildflags",
     "//ui/gfx/ipc/color",
diff --git a/chromium/ui/qt/qt.gni b/chromium/ui/qt/qt.gni
index 785f7f66d61..52b5eb59653 100644
--- a/chromium/ui/qt/qt.gni
+++ b/chromium/ui/qt/qt.gni
@@ -5,5 +5,9 @@
 import("//build/config/chromecast_build.gni")
 
 declare_args() {
-  use_qt = is_linux && !is_castos
+  is_qtwebengine = false
+}
+
+declare_args() {
+  use_qt = is_linux && !is_castos && !is_qtwebengine
 }
diff --git a/chromium/ui/touch_selection/BUILD.gn b/chromium/ui/touch_selection/BUILD.gn
index 97627d4491a..48a66d6810b 100644
--- a/chromium/ui/touch_selection/BUILD.gn
+++ b/chromium/ui/touch_selection/BUILD.gn
@@ -38,7 +38,7 @@ component("touch_selection") {
     "//ui/gfx/geometry",
   ]
 
-  if (use_aura) {
+  if (use_aura && toolkit_views) {
     deps += [
       "//skia:skia",
       "//ui/aura",
diff --git a/chromium/ui/webui/resources/BUILD.gn b/chromium/ui/webui/resources/BUILD.gn
index eeb848b7669..83391651eb1 100644
--- a/chromium/ui/webui/resources/BUILD.gn
+++ b/chromium/ui/webui/resources/BUILD.gn
@@ -95,7 +95,7 @@ generate_grd("build_grd") {
     ]
   }
 
-  if (!is_android && !is_ios) {
+  if (!is_android && !is_ios && !is_qtwebengine) {
     public_deps += [
       "cr_components/color_change_listener:build_grdp",
       "//third_party/lottie:build_grdp",