diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-12-02 13:48:15 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-12-15 14:13:57 +0000 |
| commit | f61f5b5aeb20c9025ee91c83456eefda36a14c06 (patch) | |
| tree | ae52ef3d6b8b9c03cdf6cf490d2e50ab491e538b | |
| parent | e87fa1f7fd4bf85e9d4250c69de32d43d9e5c8a0 (diff) | |
Fix build to have spellchecker compilation optional
Change-Id: I724bc1e58c8e988fa5e3afbcc6075ae7eb234843
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/build/config/features.gni | 6 | ||||
| -rw-r--r-- | chromium/chrome/renderer/BUILD.gn | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chromium/build/config/features.gni b/chromium/build/config/features.gni index 9d33d917ada..a207cddf87d 100644 --- a/chromium/build/config/features.gni +++ b/chromium/build/config/features.gni @@ -118,13 +118,13 @@ declare_args() { # Whether or not to use external popup menu. use_external_popup_menu = is_android || is_mac + + # Enable the spell checker. + enable_spellcheck = !is_ios } # Additional dependent variables ----------------------------------------------- -# Enable the spell checker. -enable_spellcheck = !is_ios - # Use the operating system's spellchecker rather than hunspell. use_browser_spellchecker = is_android || is_mac diff --git a/chromium/chrome/renderer/BUILD.gn b/chromium/chrome/renderer/BUILD.gn index 309f71033f0..a94d59401de 100644 --- a/chromium/chrome/renderer/BUILD.gn +++ b/chromium/chrome/renderer/BUILD.gn @@ -157,12 +157,12 @@ static_library("renderer") { if (!is_android) { deps += [ "//third_party/hunspell" ] } + if (!use_browser_spellchecker) { + sources -= [ + "spellchecker/platform_spelling_engine.cc", + "spellchecker/platform_spelling_engine.h", + ] } - if (!use_browser_spellchecker) { - sources -= [ - "spellchecker/platform_spelling_engine.cc", - "spellchecker/platform_spelling_engine.h", - ] } if (enable_basic_printing || enable_print_preview) { deps += [ "//printing" ] |