diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-27 17:31:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-17 14:44:17 +0100 |
| commit | 1eb20d70619cc896fc283bd6605b257a8750c518 (patch) | |
| tree | 1d308932d38759a643d8eef49b211329a2cd5467 /src/qml/qml/qqmlengine_p.h | |
| parent | e3c64aff6579f04353608d4b218f031d9137d3f4 (diff) | |
Allow partial and absent version specifiers in import statements
An import statement without version specifier imports the latest version
available, one with only a major version imports the latest minor
version from that major version.
Task-number: QTBUG-71278
Change-Id: I43907ae4e1052be533039d545de5391c41d38307
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine_p.h')
| -rw-r--r-- | src/qml/qml/qqmlengine_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 424335b61a..7b9b293832 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -402,9 +402,7 @@ The returned cache is not referenced, so if it is to be stored, call addref(). QQmlPropertyCache *QQmlEnginePrivate::cache(const QQmlType &type, QTypeRevision version) { Q_ASSERT(type.isValid()); - - if (!version.hasMinorVersion() || !type.containsRevisionedAttributes()) - return cache(type.metaObject(), version); + Q_ASSERT(type.containsRevisionedAttributes()); Locker locker(this); return QQmlMetaType::propertyCache(type, version); |