3 files changed, 16 insertions, 3 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 2a1d3041bd4..2376b881518 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -1700,7 +1700,7 @@ source_set("browser") {
   if (!is_mac) {
     deps += [ "//sandbox" ]
   }
-  if (!is_android) {
+  if (!is_android && !use_qt) {
     deps += [
       "//components/vector_icons",
       "//content/browser/tracing:resources",
@@ -2266,6 +2266,10 @@ source_set("browser") {
   }
 
   if (use_qt) {
+    sources -= [
+      "tracing/tracing_ui.cc",
+      "tracing/tracing_ui.h",
+    ]
     if (is_win) {
       sources -= [
         "accessibility/browser_accessibility_com_win.cc",
diff --git a/chromium/content/browser/webui/content_web_ui_controller_factory.cc b/chromium/content/browser/webui/content_web_ui_controller_factory.cc
index e603097af05..02a02de97ff 100644
--- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc
+++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc
@@ -31,7 +31,7 @@ WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
     return WebUI::kNoWebUI;
 
   if (url.host_piece() == kChromeUIWebRTCInternalsHost ||
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
       url.host_piece() == kChromeUITracingHost ||
 #endif
       url.host_piece() == kChromeUIGpuHost ||
@@ -79,7 +79,7 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
     return new ServiceWorkerInternalsUI(web_ui);
   if (url.host_piece() == kChromeUINetworkErrorsListingHost)
     return new NetworkErrorsListingUI(web_ui);
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
   if (url.host_piece() == kChromeUITracingHost)
     return new TracingUI(web_ui);
 #endif
diff --git a/chromium/content/shell/BUILD.gn b/chromium/content/shell/BUILD.gn
index 825408259d7..bd04a40d3e8 100644
--- a/chromium/content/shell/BUILD.gn
+++ b/chromium/content/shell/BUILD.gn
@@ -461,6 +461,15 @@ repack("pak") {
     "//ui/strings",
   ]
 
+  if (use_qt) {
+    sources -= [
+      "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+    ]
+    deps -= [
+      "//content/browser/tracing:resources",
+    ]
+  }
+
   if (toolkit_views) {
     deps += [ "//ui/views/resources" ]
     sources +=