diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2014-08-21 13:30:57 +0200 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-08-21 14:41:35 +0200 |
commit | 8e478ab97500cfd81c090074cf0cd522854a83a5 (patch) | |
tree | 6a40ace6e6363175e7767a8b5b61726d0c48c143 | |
parent | 0540dc569e5761378182485aadf4c91641f67d56 (diff) |
Update the version numbers for the WebEngine QML types.
For the WebEngineVersionBumper we have to remove the major version bits
after right shifting to determine the minor number.
Change-Id: I09f47dd261dc8de1e5cc94085ac3fdf3503588fb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r-- | src/webengine/plugin/plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 830cd89b5..689eca997 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -57,9 +57,9 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine")); - qmlRegisterType<QQuickWebEngineView>(uri, 0, 9, "WebEngineView"); - qmlRegisterUncreatableType<QQuickWebEngineLoadRequest>(uri, 0, 9, "WebEngineLoadRequest", QObject::tr("Cannot create separate instance of WebEngineLoadRequest")); - qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 0, 9, "WebEngineNewViewRequest", QObject::tr("Cannot create separate instance of WebEngineNewViewRequest")); + qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView"); + qmlRegisterUncreatableType<QQuickWebEngineLoadRequest>(uri, 1, 0, "WebEngineLoadRequest", QObject::tr("Cannot create separate instance of WebEngineLoadRequest")); + qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 1, 0, "WebEngineNewViewRequest", QObject::tr("Cannot create separate instance of WebEngineNewViewRequest")); qmlRegisterUncreatableType<QQuickWebEngineNavigationRequest>(uri, 1, 0, "WebEngineNavigationRequest", QObject::tr("Cannot create separate instance of WebEngineNavigationRequest")); // The QML type loader relies on the minimum and maximum minor version of registered types @@ -67,7 +67,7 @@ public: // a dummy type in order to allow importing the latest version even if it didn't include // an API update that would appear here in a registered type. int major = QTWEBENGINE_VERSION >> 16; - int minor = QTWEBENGINE_VERSION >> 8; + int minor = (QTWEBENGINE_VERSION >> 8) & 0xFF; qmlRegisterUncreatableType<QQuickWebEngineVersionBumper>(uri, major, minor, "WebEngineVersionBumper", QObject::tr("This is a dummy type and cannot be created.")); } }; |