aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlmetatype_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-22 18:10:23 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-29 15:51:16 +0200
commitd8513d338d8537506984a13bf1f4ef6507678286 (patch)
tree087b524a17c38a9bfa44849e3c8e45fdeba3423b /src/qml/qml/qqmlmetatype_p.h
parentbd1c28a82c2ff955e0d154fac2e2df8d5a110dd7 (diff)
Match specific module imports also for versionless QML imports
Previously, if you registered a module import for a specific version X of a module, and the user imported the module without specifying a version, the module import would not be carried out even if X was the version actually imported. Change-Id: I853ed6f275501cf4cbd4e5a360985e67b07f3773 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
-rw-r--r--src/qml/qml/qqmlmetatype_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 7b142dd07f..564a4adcf2 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -162,9 +162,9 @@ public:
static void registerCustomStringConverter(int, StringConverter);
static StringConverter customStringConverter(int);
- static bool isAnyModule(const QString &uri);
+ static QTypeRevision latestModuleVersion(const QString &uri);
static bool isLockedModule(const QString &uri, QTypeRevision version);
- static bool isModule(const QString &module, QTypeRevision version);
+ static QTypeRevision matchingModuleVersion(const QString &module, QTypeRevision version);
static QQmlTypeModule *typeModule(const QString &uri, QTypeRevision version);
static QList<QQmlPrivate::AutoParentFunction> parentFunctions();