diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-16 15:00:36 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-13 12:48:07 +0100 |
| commit | 164e559c8a7a34aa46ef7563a19100f81a1cade4 (patch) | |
| tree | 5fcef6001bbc66c4589c852603a27d93f2aa0b09 /src/qml/qml/qqmlpropertyvalidator.cpp | |
| parent | 4b8699c88bcd129a3fe34155654921ff3d5ffd5d (diff) | |
Process major versions as part of Q_REVISION
Retrieve the major version from the meta object revisions and use them
to register types and generate qmltypes files.
Change-Id: I35da8963457660d1a49ba9063574e1a68057a7ba
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertyvalidator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 01bf1bede7..001b19a8e5 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -747,9 +747,8 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateObjectBinding(QQmlPrope // We want to use the raw metaObject here as the raw metaobject is the // actual property type before we applied any extensions that might // effect the properties on the type, but don't effect assignability - // Using -1 for the minor version ensures that we get the raw metaObject. - QQmlPropertyCache *propertyMetaObject = enginePrivate->rawPropertyCacheForType(propType, - QTypeRevision()); + // Not passing a version ensures that we get the raw metaObject. + QQmlPropertyCache *propertyMetaObject = enginePrivate->rawPropertyCacheForType(propType); if (propertyMetaObject) { // Will be true if the assigned type inherits propertyMetaObject |