Give a better score for methods with a convertable type when matching

When it is looking for a matching method based on the argument types,
then if a QVariant can be converted to that type then it should give a
better score for that method. This is so that it can see it as being
more viable a choice when calling the method instead of potentially
not being able to find a matching one.

Pick-to: 5.15
Change-Id: Ief7e11feacd1d0b0959330af2576c2d01affbc54
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 4d422a3620..d37f80ab0a 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1468,8 +1468,11 @@ static int MatchScore(const QV4::Value &actual, int conversionType)
         }
 
         if (obj->as<QV4::QQmlValueTypeWrapper>()) {
-            if (obj->engine()->toVariant(actual, -1).userType() == conversionType)
+            const QVariant v = obj->engine()->toVariant(actual, -1);
+            if (v.userType() == conversionType)
                 return 0;
+            else if (v.canConvert(conversionType))
+                return 5;
             return 10;
         } else if (conversionType == QMetaType::QJsonObject) {
             return 5;