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/web_contents_view_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/web_contents_view_qt.cpp')
| -rw-r--r-- | src/core/web_contents_view_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp index daf2d48b4..4f921bd07 100644 --- a/src/core/web_contents_view_qt.cpp +++ b/src/core/web_contents_view_qt.cpp @@ -46,6 +46,7 @@ #include "web_contents_adapter.h" #include "web_engine_context.h" +#include "components/spellcheck/spellcheck_build_features.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/public/common/context_menu_params.h" #include <ui/gfx/image/image_skia.h> @@ -168,7 +169,7 @@ static inline WebEngineContextMenuData fromParams(const content::ContextMenuPara ret.setMediaFlags((WebEngineContextMenuData::MediaFlags)params.media_flags); ret.setSuggestedFileName(toQt(params.suggested_filename.data())); ret.setIsEditable(params.is_editable); -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) ret.setMisspelledWord(toQt(params.misspelled_word)); ret.setSpellCheckerSuggestions(fromVector(params.dictionary_suggestions)); #endif @@ -178,7 +179,7 @@ static inline WebEngineContextMenuData fromParams(const content::ContextMenuPara void WebContentsViewQt::ShowContextMenu(content::RenderFrameHost *, const content::ContextMenuParams ¶ms) { WebEngineContextMenuData contextMenuData(fromParams(params)); -#if defined(ENABLE_SPELLCHECK) +#if BUILDFLAG(ENABLE_SPELLCHECK) // Do not use params.spellcheck_enabled, since it is never // correctly initialized for chrome asynchronous spellchecking. // Even fixing the initialization in ContextMenuClientImpl::showContextMenu |