FIXUP: Qt GN integration

Change-Id: Iecb6e5e773cd68b80f6af071c0ebe12c1230d4d1
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/443704
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

7 files changed, 9 insertions, 5 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index e9900059609..e30cdbc916a 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -84,7 +84,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",
diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn
index a96472b1182..c37caf1e271 100644
--- a/chromium/chrome/installer/linux/BUILD.gn
+++ b/chromium/chrome/installer/linux/BUILD.gn
@@ -241,7 +241,7 @@ if (build_with_internal_optimization_guide) {
   }
 }
 
-if (use_qt) {
+if (use_qt5) {
   strip_binary("strip_qt5_shim") {
     binary_input = "$root_out_dir/libqt5_shim.so"
     deps = [ "//ui/qt:qt5_shim" ]
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn
index 3901f6d1854..5ae982ed361 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/ui/gl/gl_display.cc b/chromium/ui/gl/gl_display.cc
index cb221a29446..62501a7dd14 100644
--- a/chromium/ui/gl/gl_display.cc
+++ b/chromium/ui/gl/gl_display.cc
@@ -764,6 +764,7 @@ void GLDisplayEGL::SetDisplay(EGLDisplay display) {
   display_ = display;
 }
 
+#if !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC)
 EGLDisplayPlatform GLDisplayEGL::GetNativeDisplay() const {
   return native_display_;
 }
@@ -1030,6 +1031,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/linux/BUILD.gn b/chromium/ui/linux/BUILD.gn
index 436f05bd6da..3f0d9574c2b 100644
--- a/chromium/ui/linux/BUILD.gn
+++ b/chromium/ui/linux/BUILD.gn
@@ -59,7 +59,7 @@ source_set("linux_ui_factory") {
     # This is the only component that can interact with gtk.
     deps += [ "//ui/gtk" ]
   }
-  if (use_qt) {
+  if (use_qt5) {
     deps += [ "//ui/qt" ]
   }
 }
diff --git a/chromium/ui/qt/BUILD.gn b/chromium/ui/qt/BUILD.gn
index 2382cd30cc4..43052a33636 100644
--- a/chromium/ui/qt/BUILD.gn
+++ b/chromium/ui/qt/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/chromecast_build.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//ui/qt/qt.gni")
 
-assert(use_qt)
+assert(use_qt5)
 assert(is_linux)
 assert(!is_castos)
 
diff --git a/chromium/ui/qt/qt.gni b/chromium/ui/qt/qt.gni
index 7b1dbf66d53..292faff0d1d 100644
--- a/chromium/ui/qt/qt.gni
+++ b/chromium/ui/qt/qt.gni
@@ -5,4 +5,6 @@
 declare_args() {
   # https://crbug.com/1317782 enable QT UI by default on Linux.
   use_qt = false
+
+  use_qt5 = false
 }