Commit 88d5cb11 authored by Jocelyn Turcotte's avatar Jocelyn Turcotte
Browse files

Use the same version scheme as other Qt modules


After trying to get rid of all private header includes, the last
standing one is qplatformnativeinterface.h even though its name
previously suggested that it isn't private.

This would be a complicated piece to expose publically in a way both
flexible and binary compatible, and is a task heavy enough to
justify committing to follow Qt's release cycle.

The QML import version remains to 1.0 and will be incremented the
same manner as QtQuick itself does.

Change-Id: I6fab5f229d9f79dbc7a3e82d65ad324020929863
Reviewed-by: default avatarMichael Bruning <michael.bruning@digia.com>
parent 50f79d4b
Branches
Tags
No related merge requests found
Showing with 1 addition and 11 deletions
......@@ -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
......@@ -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."));
}
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment