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/qquickwebengineprofile.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/qquickwebengineprofile.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 3873bc9c5..f38422966 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -612,30 +612,29 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile() return profile; } -#if !defined(QT_NO_SPELLCHECK) /*! - \qmlmethod void QQuickWebEngineProfile::spellCheckLanguages() + \qmlmethod void QQuickWebEngineProfile::availableDictionaries() - Returns the subset of \a acceptLanguages supported by the spell checker. + Returns the subset of \a languages supported by the spell checker. Checks whether the spell checker dictionary is installed for the specified - language from the \a acceptLanguages list. If the dictionary file is missing + language from the \a languages list. If the dictionary file is missing or corrupted, the language is removed from the returned list. \since QtWebEngine 1.3 */ /*! - Returns the subset of \a acceptLanguages supported by the spell checker. + Returns the subset of \a languages supported by the spell checker. Checks whether the spell checker dictionary is installed for the specified - language from the \a acceptLanguages list. If the dictionary file is missing + language from the \a languages list. If the dictionary file is missing or corrupted, the language is removed from the returned list. \since QtWebEngine 1.3 */ -QStringList QQuickWebEngineProfile::spellCheckLanguages(const QStringList &acceptLanguages) +QStringList QQuickWebEngineProfile::availableDictionaries(const QStringList &languages) { const Q_D(QQuickWebEngineProfile); - return d->browserContext()->spellCheckLanguages(acceptLanguages); + return d->browserContext()->spellCheckLanguages(languages); } /*! @@ -700,7 +699,6 @@ bool QQuickWebEngineProfile::isSpellCheckEnabled() const const Q_D(QQuickWebEngineProfile); return d->browserContext()->isSpellCheckEnabled(); } -#endif /*! |