diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-05 13:50:54 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-18 21:07:33 +0000 |
| commit | d92d6f0db266685839b0e4c5d1a180028bb9a2eb (patch) | |
| tree | 71c0a06d108ebdbec80b7e869f48a14f7b259d34 /src | |
| parent | 83b22abcacb5704b94f5003d6242e42417b5c901 (diff) | |
QmlCompiler: Use QVariant as last fallback for type merges
The two types are equivalent in what we can store in them. However, as
var properties are considered to be QVariant, falling back to QVariant
results in fewer type conversions when returning from binding functions.
We rarely want to handle QJSValue explicitly.
Change-Id: I0afed723e02982e28b33e35671224fd04689d09c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit cee66a1514156b0a8d656b8183638088fa152cc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmlcompiler/qqmljstyperesolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljstyperesolver.cpp b/src/qmlcompiler/qqmljstyperesolver.cpp index 9c5264e68d..22254c3477 100644 --- a/src/qmlcompiler/qqmljstyperesolver.cpp +++ b/src/qmlcompiler/qqmljstyperesolver.cpp @@ -468,7 +468,7 @@ QQmlJSScope::ConstPtr QQmlJSTypeResolver::merge(const QQmlJSScope::ConstPtr &a, if (auto commonBase = commonBaseType(a, b)) return commonBase; - return jsValueType(); + return varType(); } QQmlJSScope::ConstPtr QQmlJSTypeResolver::genericType(const QQmlJSScope::ConstPtr &type, |