diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-25 12:22:30 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-25 12:23:33 +0200 |
| commit | f1dcd959463f80bb9310bc863051f010b94e9b9b (patch) | |
| tree | 137ce36929a3d333776617ecebc1ad794c91aca2 /src | |
| parent | 8ddc67c49f33efdef6b1418aa9090a5d784e1ed4 (diff) | |
| parent | 9931c0ca3324897c34fc557962d4af808cbe2b04 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.6
Change-Id: Iee44f6f41c00838c9efe30f600200307bdef770a
Diffstat (limited to 'src')
| -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 1824b3e96..1f68879e3 100644 --- a/src/webengine/api/qquickwebengineprofile_p.h +++ b/src/webengine/api/qquickwebengineprofile_p.h @@ -116,8 +116,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(); @@ -130,7 +130,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", |