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.h | |
| 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.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webengine/api/qquickwebengineprofile.h index cf4334126..8d120d10e 100644 --- a/src/webengine/api/qquickwebengineprofile.h +++ b/src/webengine/api/qquickwebengineprofile.h @@ -71,10 +71,8 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineProfile : public QObject { Q_PROPERTY(QString httpAcceptLanguage READ httpAcceptLanguage WRITE setHttpAcceptLanguage NOTIFY httpAcceptLanguageChanged FINAL REVISION 1) Q_PROPERTY(PersistentCookiesPolicy persistentCookiesPolicy READ persistentCookiesPolicy WRITE setPersistentCookiesPolicy NOTIFY persistentCookiesPolicyChanged FINAL) Q_PROPERTY(int httpCacheMaximumSize READ httpCacheMaximumSize WRITE setHttpCacheMaximumSize NOTIFY httpCacheMaximumSizeChanged FINAL) -#if !defined(QT_NO_SPELLCHECK) - Q_PROPERTY(QString spellCheckLanguage READ spellCheckLanguage WRITE setSpellCheckLanguage NOTIFY spellCheckLanguageChanged REVISION 2) - Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged REVISION 2) -# endif + Q_PROPERTY(QString spellCheckLanguage READ spellCheckLanguage WRITE setSpellCheckLanguage NOTIFY spellCheckLanguageChanged FINAL REVISION 2) + Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged FINAL REVISION 2) public: QQuickWebEngineProfile(QObject *parent = Q_NULLPTR); @@ -133,13 +131,11 @@ public: void clearHttpCache(); -#if !defined(QT_NO_SPELLCHECK) - Q_REVISION(2) Q_INVOKABLE QStringList spellCheckLanguages(const QStringList &acceptLanguages); + Q_REVISION(2) Q_INVOKABLE QStringList availableDictionaries(const QStringList &languages); Q_REVISION(2) void setSpellCheckLanguage(const QString &language); Q_REVISION(2) QString spellCheckLanguage() const; Q_REVISION(2) void setSpellCheckEnabled(bool enabled); Q_REVISION(2) bool isSpellCheckEnabled() const; -# endif static QQuickWebEngineProfile *defaultProfile(); @@ -153,10 +149,8 @@ Q_SIGNALS: void persistentCookiesPolicyChanged(); void httpCacheMaximumSizeChanged(); Q_REVISION(1) void httpAcceptLanguageChanged(); -#if !defined(QT_NO_SPELLCHECK) Q_REVISION(2) void spellCheckLanguageChanged(); Q_REVISION(2) void spellCheckEnabledChanged(); -#endif void downloadRequested(QQuickWebEngineDownloadItem *download); void downloadFinished(QQuickWebEngineDownloadItem *download); |