summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Goldstein <max.goldstein@qt.io>2021-02-08 14:36:14 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-08 16:51:48 +0000
commit3dda59305053240d154cab3b35fbcbcc9cfa9042 (patch)
tree425f5a9a7ac700b572e784b8d4232112e1de83d1
parent16d98bcab940167ef0df424ec106af8e48c25ce4 (diff)
qmlplugindump: Fix overload ambiguity
Fixes: QTBUG-89955 Change-Id: I89ce8a146c0ce07c8e308783f79677575458c71c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 40eaa9509b1c2e430b7617e1b42aa66214ad80df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tools/qmlplugindump/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index df292ebb27..c3a08d72ab 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)