From c4fc1167188cde9e89d44a8e5e02c5b1e04c61a7 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 2 Dec 2022 13:56:20 +0100 Subject: QmlCompiler: Fix recognition of builtin list types Previously all list types used as arguments or return types for methods had to be looked up via the imports. However, builtin types are not part of the imports at run time. Therefore, recognize list types already early on, when generating the IR. This is the same way we do it for property types and it allows us to easily identify lists of builtins. Pick-to: 6.5 Fixes: QTBUG-109147 Change-Id: I91fa9c8fc99c1e0155cc5db5faddd928ca7fabbc Reviewed-by: Ulf Hermann --- src/qml/compiler/qv4compilerscanfunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/compiler/qv4compilerscanfunctions.cpp') diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp index 157d2896aa..380cf66f47 100644 --- a/src/qml/compiler/qv4compilerscanfunctions.cpp +++ b/src/qml/compiler/qv4compilerscanfunctions.cpp @@ -675,7 +675,7 @@ bool ScanFunctions::enterFunction( _context->isGenerator = true; if (expr->typeAnnotation) - _context->returnType = expr->typeAnnotation->type->toString(); + _context->returnType = expr->typeAnnotation->type; } -- cgit v1.2.1