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/content_browser_client_qt.cpp | |
| 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/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 1ae6f1307..b45463d73 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -42,9 +42,10 @@ #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread_restrictions.h" -#if defined(ENABLE_SPELLCHECK) +#include "components/spellcheck/spellcheck_build_features.h" +#if BUILDFLAG(ENABLE_SPELLCHECK) #include "chrome/browser/spellchecker/spellcheck_message_filter.h" -#if defined(USE_BROWSER_SPELLCHECKER) +#if BUILDFLAG(USE_BROWSER_SPELLCHECKER) #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" #endif #endif @@ -414,11 +415,11 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost* #if defined(ENABLE_PEPPER_CDMS) host->AddFilter(new BrowserMessageFilterQt(id)); #endif -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) // SpellCheckMessageFilter is required for both Hunspell and Native configurations. host->AddFilter(new SpellCheckMessageFilter(id)); #endif -#if defined(Q_OS_MACOS) && defined(ENABLE_SPELLCHECK) && defined(USE_BROWSER_SPELLCHECKER) +#if defined(Q_OS_MACOS) && BUILDFLAG(ENABLE_SPELLCHECK) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) host->AddFilter(new SpellCheckMessageFilterPlatform(id)); #endif #if BUILDFLAG(ENABLE_BASIC_PRINTING) |