diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-06-17 15:16:49 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-06-22 07:20:15 +0000 |
| commit | 0c366eb741d8d925418c517d3954900c090aca3d (patch) | |
| tree | 54fd7e7ff212bc73b8836574174e842edd02560a | |
| parent | 8a77cd16793bc91b0f7c267fc579a3041dd55e61 (diff) | |
Fix quicktestbrowser crash caused by wrong experimental version
The version number of the experimental extension should not
be changed but we should register the latest WebEngineView
for experimental version 1.0. This fixes quicktestbrowser
"Cannot assign to non-existent property "experimental""
issue on startup.
Also update the QtWebEngine import version in the test
browser so that all the new public APIs are visible.
The QML code has already been updated in a previous patch.
Change-Id: Ic8398df6e62ce7cb80c805171f3777d62c0c39a1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | src/webengine/plugin/experimental/plugin.cpp | 4 | ||||
| -rw-r--r-- | tests/quicktestbrowser/BrowserWindow.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp index 21def1a66..507286e2f 100644 --- a/src/webengine/plugin/experimental/plugin.cpp +++ b/src/webengine/plugin/experimental/plugin.cpp @@ -61,14 +61,14 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine.experimental")); - qmlRegisterExtendedType<QQuickWebEngineView, QQuickWebEngineViewExperimentalExtension>(uri, 1, 2, "WebEngineView"); + qmlRegisterExtendedType<QQuickWebEngineView, QQuickWebEngineViewExperimentalExtension>(uri, 1, 0, "WebEngineView"); qmlRegisterUncreatableType<QQuickWebEngineViewExperimental>(uri, 1, 0, "WebEngineViewExperimental", QObject::tr("Cannot create a separate instance of WebEngineViewExperimental")); qmlRegisterUncreatableType<QQuickWebEngineViewport>(uri, 1, 0, "WebEngineViewport", QObject::tr("Cannot create a separate instance of WebEngineViewport")); // Use the latest revision of QQuickWebEngineView when importing QtWebEngine.experimental 1.0 - qmlRegisterRevision<QQuickWebEngineView, LATEST_WEBENGINEVIEW_REVISION>(uri, 1, LATEST_WEBENGINEVIEW_REVISION); + qmlRegisterRevision<QQuickWebEngineView, LATEST_WEBENGINEVIEW_REVISION>(uri, 1, 0); } }; diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml index e626f00c7..9f15d188e 100644 --- a/tests/quicktestbrowser/BrowserWindow.qml +++ b/tests/quicktestbrowser/BrowserWindow.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtWebEngine 1.1 +import QtWebEngine 1.2 import QtWebEngine.experimental 1.0 import QtQuick.Controls 1.0 |