From 3dda59305053240d154cab3b35fbcbcc9cfa9042 Mon Sep 17 00:00:00 2001
From: Maximilian Goldstein <max.goldstein@qt.io>
Date: Mon, 8 Feb 2021 14:36:14 +0100
Subject: 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>
---
 tools/qmlplugindump/main.cpp | 11 ++++++-----
 1 file 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)
-- 
cgit v1.2.3