diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-04-11 15:31:36 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2016-04-18 13:10:09 +0000 |
| commit | 7d172fcf39fa2a5d7d5202f20c599eb678f6cb58 (patch) | |
| tree | 98ece282fa13332cc52352b65f941126f0fc88d5 /src/webengine/api/qquickwebenginecontextmenudata.cpp | |
| parent | ee2b1e71a80f88de90a03e10a89ba491ef99d308 (diff) | |
Update spellchecker APIs
* marks new properties in QQuickWebEngineProfile as FINAL
* removes QT_NO_SPELLCHECK from API headers
* renames spellCheckLanguages() to availableDictionaries()
* removes "togle spellcheck" methods and actions
* use WEBENGINE_CONFIG instead of CONFIG for disable the feature at
compile time: WEBENGINE_CONFIG+=no_spellcheck
Done-With: Peter Varga <pvarga@inf.u-szeged.hu>
Task-number: QTBUG-52371
Change-Id: I8c8eff497b9e7afe0cec2edc97dec248151487f2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebenginecontextmenudata.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginecontextmenudata.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginecontextmenudata.cpp b/src/webengine/api/qquickwebenginecontextmenudata.cpp index 9fec90525..221b42245 100644 --- a/src/webengine/api/qquickwebenginecontextmenudata.cpp +++ b/src/webengine/api/qquickwebenginecontextmenudata.cpp @@ -170,7 +170,6 @@ bool QQuickWebEngineContextMenuData::isContentEditable() const return d ? d->isEditable : false; } -#if !defined(QT_NO_SPELLCHECK) /*! \qmlproperty QString WebEngineDownloadItem::misspelledWord @@ -194,7 +193,6 @@ QStringList QQuickWebEngineContextMenuData::spellCheckerSuggestions() const return d->spellCheckerSuggestions; return QStringList(); } -#endif void QQuickWebEngineContextMenuData::update(const QtWebEngineCore::WebEngineContextMenuData &update) { @@ -225,13 +223,11 @@ void QQuickWebEngineContextMenuData::update(const QtWebEngineCore::WebEngineCont if (isContentEditable() != old.isContentEditable()) Q_EMIT isContentEditableChanged(); -#if !defined(QT_NO_SPELLCHECK) if (misspelledWord() != old.misspelledWord()) Q_EMIT misspelledWordChanged(); if (spellCheckerSuggestions() != old.spellCheckerSuggestions()) Q_EMIT spellCheckerSuggestionsChanged(); -#endif } QQuickWebEngineContextMenuData::QQuickWebEngineContextMenuData(const QQuickWebEngineContextMenuDataPrivate *p, QObject *parent) |