From 1ff575f93c7e58a4ffe89f73bed4b0c9eb93f070 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 8 Apr 2025 13:49:49 +0000 Subject: [PATCH] QmlDesigner: Revert "QMLRewriter: Fix the very first child position case This reverts commit 398b783f1a8b279082f1098408bdb836095f616b. Reason for revert: This crashes on Linux/macOS. Change-Id: I71068e22bccfc9bcf5f1ada287aa86194c133f5f Reviewed-by: Ali Kianian --- .../libs/designercore/filemanager/qmlrewriter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/libs/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/libs/designercore/filemanager/qmlrewriter.cpp index aa2f794e4da..77021f02324 100644 --- a/src/plugins/qmldesigner/libs/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/libs/designercore/filemanager/qmlrewriter.cpp @@ -275,6 +275,9 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter( QmlJS::AST::UiObjectMemberList *QMLRewriter::searchChildrenToInsertAfter( QmlJS::AST::UiObjectMemberList *members, const PropertyNameList &propertyOrder, int pos) { + if (pos < 0) + return searchMemberToInsertAfter(members, propertyOrder); + // An empty property name should be available in the propertyOrder List, which is the right place // to define the objects there. const int objectDefinitionInsertionPoint = propertyOrder.indexOf(PropertyName()); @@ -288,8 +291,6 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchChildrenToInsertAfter( int idx = -1; if (QmlJS::AST::cast(member)) { - if (pos < 0) - break; lastObjectDef = iter; if (objectPos++ == pos) break;