Fix building with spellchecking disabled

Change-Id: Ia3744634a746fe49b34e10a3b97762fa5b67745c
Fixes: QTBUG-76869
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 21 insertions, 4 deletions

diff --git a/chromium/qtwebengine/browser/BUILD.gn b/chromium/qtwebengine/browser/BUILD.gn
index 2f09e22f523..177ca8aa54b 100644
--- a/chromium/qtwebengine/browser/BUILD.gn
+++ b/chromium/qtwebengine/browser/BUILD.gn
@@ -1,4 +1,5 @@
 import("//chrome/common/features.gni")
+import("//components/spellcheck/spellcheck_build_features.gni")
 import("//tools/grit/grit_rule.gni")
 import ("//mojo/public/tools/bindings/mojom.gni")
 
@@ -50,10 +51,12 @@ source_set("qtwebengine_packaged_service_manifests") {
 
   deps = [
     "//base",
-    "//components/spellcheck/common:interfaces",
     "//services/proxy_resolver/public/cpp:manifest",
     "//services/service_manager/public/cpp",
   ]
+  if (enable_spellcheck) {
+    deps += [ "//components/spellcheck/common:interfaces" ]
+  }
 }
 
 source_set("qtwebengine_renderer_manifest") {
@@ -64,9 +67,11 @@ source_set("qtwebengine_renderer_manifest") {
 
   deps = [
     "//base",
-    "//components/spellcheck/common:interfaces",
     "//services/service_manager/public/cpp",
   ]
+  if (enable_spellcheck) {
+    deps += [ "//components/spellcheck/common:interfaces" ]
+  }
 }
 
 
diff --git a/chromium/qtwebengine/browser/qtwebengine_packaged_service_manifest.cc b/chromium/qtwebengine/browser/qtwebengine_packaged_service_manifest.cc
index bc21c437268..9bad79a1994 100644
--- a/chromium/qtwebengine/browser/qtwebengine_packaged_service_manifest.cc
+++ b/chromium/qtwebengine/browser/qtwebengine_packaged_service_manifest.cc
@@ -6,10 +6,14 @@
 
 #include "base/no_destructor.h"
 #include "build/build_config.h"
-#include "components/spellcheck/common/spellcheck.mojom.h"
+#include "components/spellcheck/spellcheck_buildflags.h"
 #include "services/proxy_resolver/public/cpp/manifest.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
 
+#if BUILDFLAG(ENABLE_SPELLCHECK)
+#include "components/spellcheck/common/spellcheck.mojom.h"
+#endif
+
 namespace {
 
 const service_manager::Manifest &GetQtWebEngineManifest()
@@ -23,8 +27,10 @@ const service_manager::Manifest &GetQtWebEngineManifest()
                              .CanConnectToInstancesWithAnyId(true)
                              .CanRegisterOtherServiceInstances(true)
                              .Build())
+#if BUILDFLAG(ENABLE_SPELLCHECK)
             .ExposeCapability("renderer",
                               service_manager::Manifest::InterfaceList<spellcheck::mojom::SpellCheckHost>())
+#endif
         .RequireCapability("qtwebengine_renderer", "browser")
         .Build()
   };
diff --git a/chromium/qtwebengine/browser/qtwebengine_renderer_manifest.cc b/chromium/qtwebengine/browser/qtwebengine_renderer_manifest.cc
index f6a62753bc4..ec433fa3dff 100644
--- a/chromium/qtwebengine/browser/qtwebengine_renderer_manifest.cc
+++ b/chromium/qtwebengine/browser/qtwebengine_renderer_manifest.cc
@@ -6,17 +6,23 @@
 
 #include "base/no_destructor.h"
 #include "build/build_config.h"
-#include "components/spellcheck/common/spellcheck.mojom.h"
+#include "components/spellcheck/spellcheck_buildflags.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
 
+#if BUILDFLAG(ENABLE_SPELLCHECK)
+#include "components/spellcheck/common/spellcheck.mojom.h"
+#endif
+
 const service_manager::Manifest& GetQtWebEngineRendererManifest()
 {
     static base::NoDestructor<service_manager::Manifest> manifest{
         service_manager::ManifestBuilder()
             .WithServiceName("qtwebengine_renderer")
             .WithDisplayName("QtWebEngine Renderer")
+#if BUILDFLAG(ENABLE_SPELLCHECK)
             .ExposeCapability("browser",
                               service_manager::Manifest::InterfaceList<spellcheck::mojom::SpellChecker>())
+#endif
             .RequireCapability("qtwebengine", "renderer")
             .Build()};
     return *manifest;