diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-08-13 13:47:07 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-08-24 13:21:16 +0000 |
| commit | 9931c0ca3324897c34fc557962d4af808cbe2b04 (patch) | |
| tree | 0793c84bb67628723f11474526b7f78269412ed3 | |
| parent | dc7d93ef5364f82b5131143532b41620d57d9548 (diff) | |
fix revision for httpAcceptLanguage property of WebEngineProfile
Change-Id: I374d6ffa968e6cc9a3317f0c8860402da84a1b5b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile_p.h | 6 | ||||
| -rw-r--r-- | src/webengine/plugin/plugin.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h index 174734fa1..72e5716d0 100644 --- a/src/webengine/api/qquickwebengineprofile_p.h +++ b/src/webengine/api/qquickwebengineprofile_p.h @@ -105,8 +105,8 @@ public: int httpCacheMaximumSize() const; void setHttpCacheMaximumSize(int maxSize); - Q_REVISION(2) QString httpAcceptLanguage() const; - Q_REVISION(2) void setHttpAcceptLanguage(const QString &httpAcceptLanguage); + Q_REVISION(1) QString httpAcceptLanguage() const; + Q_REVISION(1) void setHttpAcceptLanguage(const QString &httpAcceptLanguage); static QQuickWebEngineProfile *defaultProfile(); @@ -119,7 +119,7 @@ signals: void httpCacheTypeChanged(); void persistentCookiesPolicyChanged(); void httpCacheMaximumSizeChanged(); - Q_REVISION(2) void httpAcceptLanguageChanged(); + Q_REVISION(1) void httpAcceptLanguageChanged(); void downloadRequested(QQuickWebEngineDownloadItem *download); void downloadFinished(QQuickWebEngineDownloadItem *download); diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index e4b96c47b..cb8950019 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -71,6 +71,7 @@ public: qmlRegisterType<QQuickWebEngineView, 1>(uri, 1, 1, "WebEngineView"); qmlRegisterType<QQuickWebEngineView, 2>(uri, 1, 2, "WebEngineView"); qmlRegisterType<QQuickWebEngineProfile>(uri, 1, 1, "WebEngineProfile"); + qmlRegisterType<QQuickWebEngineProfile, 1>(uri, 1, 2, "WebEngineProfile"); qmlRegisterType<QQuickWebEngineScript>(uri, 1, 1, "WebEngineScript"); qmlRegisterUncreatableType<QQuickWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", QObject::tr("Cannot create separate instance of WebEngineCertificateError")); qmlRegisterUncreatableType<QQuickWebEngineDownloadItem>(uri, 1, 1, "WebEngineDownloadItem", |