diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | src/webengine/plugin/plugin.cpp | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index 61a377b80..cbd25f247 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,4 @@ QMAKEPATH += $$PWD/tools/qmake load(qt_build_config) CONFIG += qt_example_installs -# We released 1.0.0 together with 5.4.0. Since then we're 4 majors -# and 4 minors behind, until we need to release standalone. -MODULE_VERSION = 1.0.0 +MODULE_VERSION = 5.4.0 diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 7a759fcd7..60e401301 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -61,14 +61,6 @@ public: 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 - // to validate imports. We want to tie our import version to the module version, so register - // 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) & 0xFF; - qmlRegisterUncreatableType<QQuickWebEngineVersionBumper>(uri, major, minor, "WebEngineVersionBumper", QObject::tr("This is a dummy type and cannot be created.")); } }; |