diff options
Diffstat (limited to 'tools/qmlplugindump/main.cpp')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 11856ec5ef..b2296a9ec1 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -108,15 +108,16 @@ struct QmlVersionInfo }; static bool matchingImportUri(const QQmlType &ty, const QmlVersionInfo& versionInfo) { + const QString &module = ty.module(); if (versionInfo.strict) { - return (versionInfo.pluginImportUri == ty.module() + return (versionInfo.pluginImportUri == module && (ty.version().majorVersion() == versionInfo.version.majorVersion() || !ty.version().hasMajorVersion())) - || ty.module().isEmpty(); + || module.isEmpty(); } - return ty.module().isEmpty() - || versionInfo.pluginImportUri == ty.module() - || ty.module().startsWith(versionInfo.pluginImportUri + QLatin1Char('.')); + return module.isEmpty() + || versionInfo.pluginImportUri == module + || module.startsWith(versionInfo.pluginImportUri + QLatin1Char('.')); } void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject *> *metas, const QmlVersionInfo &info, bool extended = false, bool alreadyChangedModule = false) |