From 0c366eb741d8d925418c517d3954900c090aca3d Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 17 Jun 2015 15:16:49 +0200 Subject: 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 --- src/webengine/plugin/experimental/plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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(uri, 1, 2, "WebEngineView"); + qmlRegisterExtendedType(uri, 1, 0, "WebEngineView"); qmlRegisterUncreatableType(uri, 1, 0, "WebEngineViewExperimental", QObject::tr("Cannot create a separate instance of WebEngineViewExperimental")); qmlRegisterUncreatableType(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(uri, 1, LATEST_WEBENGINEVIEW_REVISION); + qmlRegisterRevision(uri, 1, 0); } }; -- cgit v1.2.3