Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index aab3f8e9d6..171dc641d3 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -908,7 +908,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
 
 bool IRBuilder::visit(QQmlJS::AST::UiSourceElement *node)
 {
-    if (QQmlJS::AST::FunctionDeclaration *funDecl = QQmlJS::AST::cast<QQmlJS::AST::FunctionDeclaration *>(node->sourceElement)) {
+    if (QQmlJS::AST::FunctionExpression *funDecl = node->sourceElement->asFunctionDefinition()) {
         CompiledFunctionOrExpression *foe = New<CompiledFunctionOrExpression>();
         foe->node = funDecl;
         foe->parentNode = funDecl;
@@ -1770,7 +1770,7 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
     for (const CompiledFunctionOrExpression &f : functions) {
         Q_ASSERT(f.node != document->program);
         Q_ASSERT(f.parentNode && f.parentNode != document->program);
-        QQmlJS::AST::FunctionDeclaration *function = QQmlJS::AST::cast<QQmlJS::AST::FunctionDeclaration*>(f.node);
+        auto function = f.node->asFunctionDefinition();
 
         if (function) {
             scan.enterQmlFunction(function);
@@ -1794,7 +1794,7 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
         QQmlJS::AST::Node *node = qmlFunction.node;
         Q_ASSERT(node != document->program);
 
-        QQmlJS::AST::FunctionDeclaration *function = QQmlJS::AST::cast<QQmlJS::AST::FunctionDeclaration*>(node);
+        QQmlJS::AST::FunctionExpression *function = node->asFunctionDefinition();
 
         QString name;
         if (function)