diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-11-07 11:31:55 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-11-10 09:13:22 +0100 |
| commit | ad01abe1a62ea50d19cca2b4ccd799b9a01e3e12 (patch) | |
| tree | 09c3822aad429ca2da30f6c56a9230f2788cf81e /src/qml/qml/qqml.cpp | |
| parent | f81945e1d79f69c27340cc2ba1a5919957eae514 (diff) | |
Consider the major version when registering singletons
Amends 9225723a317b8c7e805416592b78aca0ed320049
Fixes: QTBUG-117958
Pick-to: 6.6 6.5
Change-Id: Ifbaa30d6f82e37d35d7d3be57fe562dae9d09c10
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.cpp')
| -rw-r--r-- | src/qml/qml/qqml.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index f19950899e..bac2d663b5 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -651,7 +651,7 @@ int QQmlPrivate::qmlregister(RegistrationType type, void *data) const QTypeRevision added = revisionClassInfo( type.classInfoMetaObject, "QML.AddedInVersion", - QTypeRevision::fromMinorVersion(0)); + QTypeRevision::fromVersion(type.version.majorVersion(), 0)); const QTypeRevision removed = revisionClassInfo( type.classInfoMetaObject, "QML.RemovedInVersion"); const QList<QTypeRevision> furtherRevisions = revisionClassInfos(type.classInfoMetaObject, |