diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-04-06 12:56:00 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-04-06 17:37:15 +0000 |
| commit | c37ce122ed0421b39a84eb5c9042964863219031 (patch) | |
| tree | e10316e343c055e965587d50e683ab6b1cbb2d1a | |
| parent | a3551e266843ce007c71a2dffdd9a2df22001ae1 (diff) | |
Fix disabling spell checker support
Change-Id: I46805d8956815e4d691afd05a69ff16d6a86ad6b
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 2 | ||||
| -rw-r--r-- | src/core/type_conversion.h | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index ba223d878..d475c7801 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -56,7 +56,9 @@ namespace web_cache { class WebCacheRenderProcessObserver; } +#if defined(ENABLE_SPELLCHECK) class SpellCheck; +#endif namespace QtWebEngineCore { diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 8789cf2b7..84f91ec3e 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -254,7 +254,6 @@ inline std::vector<T> toVector(const QStringList &fileList) int flagsFromModifiers(Qt::KeyboardModifiers modifiers); -#if defined(ENABLE_SPELLCHECK) inline QStringList fromVector(const std::vector<base::string16> &vector) { QStringList result; @@ -263,7 +262,6 @@ inline QStringList fromVector(const std::vector<base::string16> &vector) } return result; } -#endif FaviconInfo toFaviconInfo(const content::FaviconURL &); diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 326f1b08d..341c4724d 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1095,6 +1095,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool) } } +#if !defined(QT_NO_SPELLCHECK) /*! * \since 5.7 * Replace the current misspelled word with \a replacement. @@ -1110,6 +1111,7 @@ void QWebEnginePage::replaceMisspelledWord(const QString &replacement) Q_D(QWebEnginePage); d->adapter->replaceMisspelling(replacement); } +#endif void QWebEnginePage::findText(const QString &subString, FindFlags options, const QWebEngineCallback<bool> &resultCallback) { |