diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-03 18:25:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-04 08:18:59 +0000 |
| commit | 03b20ee9c152414de89dbc28a5c8e3c98f66ae04 (patch) | |
| tree | ce85e68cc77309993d05cae1076f5c6275f48ef3 /src/core/renderer | |
| parent | bfe8875e2119568786b1e98710d44f898313add4 (diff) | |
Fix spellcheck feature check
Was changed to generated buildflag headers instead of command line
defines.
Task-number: QTBUG-59687
Change-Id: Iead64f5321d000c07172ee27a0032394527ec501
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/renderer')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 6 | ||||
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 09d47380f..93badf853 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -44,7 +44,7 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) #include "components/spellcheck/renderer/spellcheck.h" #include "components/spellcheck/renderer/spellcheck_provider.h" #endif @@ -104,7 +104,7 @@ void ContentRendererClientQt::RenderThreadStarted() m_visitedLinkSlave->GetBindCallback()); renderThread->AddObserver(UserResourceController::instance()); -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) m_spellCheck.reset(new SpellCheck()); renderThread->AddObserver(m_spellCheck.data()); #endif @@ -120,7 +120,7 @@ void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view new RenderViewObserverQt(render_view, m_webCacheImpl.data()); new WebChannelIPCTransport(render_view); UserResourceController::instance()->renderViewCreated(render_view); -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) new SpellCheckProvider(render_view, m_spellCheck.data()); #endif diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 72b4e4061..c373665ee 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -40,6 +40,7 @@ #define CONTENT_RENDERER_CLIENT_QT_H #include "content/public/renderer/content_renderer_client.h" +#include "components/spellcheck/spellcheck_build_features.h" #include <QtGlobal> #include <QScopedPointer> @@ -52,7 +53,7 @@ namespace web_cache { class WebCacheImpl; } -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) class SpellCheck; #endif @@ -80,7 +81,7 @@ public: private: QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave; QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl; -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) QScopedPointer<SpellCheck> m_spellCheck; #endif }; |