diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2021-02-08 14:36:14 +0100 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2021-02-11 13:21:58 +0100 |
| commit | 2426d3aec582e929cf1390368968427676f56160 (patch) | |
| tree | a83ac7f76b93ab8247b113d4ce1025b7c0e33b85 /tools | |
| parent | 351695310dbc2b78fb924d2637dd8980106a4482 (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: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index f5a5bda4b6..05c7f75044 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -109,14 +109,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() - && (ty.majorVersion() == versionInfo.majorVersion || ty.majorVersion() == -1)) - || ty.module().isEmpty(); + return (versionInfo.pluginImportUri == module + && (ty.majorVersion() == versionInfo.majorVersion + || ty.majorVersion() == -1)) + || 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) |