From a86cb745261d96ce71da306b0b373db726876961 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 2 Dec 2022 15:52:55 +0100 Subject: [PATCH] QmlDesigner: QtObject is in QML now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a type cannot be created we created a QtObject instead. Since we create Item for items this crash was rare. Task-number: QDS-8460 Change-Id: Ifd80f6670bec5328ddd122e0f2f2c133c487b3bd Reviewed-by: Qt CI Bot Reviewed-by: Henning Gründl --- .../qml2puppet/instances/servernodeinstance.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp index 8ea0eaf8061..e7229f06a6e 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp @@ -285,7 +285,15 @@ ServerNodeInstance ServerNodeInstance::create(NodeInstanceServer *nodeInstanceSe if (object == nullptr) object = new QQuickItem; } else { - object = Internal::ObjectNodeInstance::createPrimitive("QtQml/QtObject", 2, 0, nodeInstanceServer->context()); + object = Internal::ObjectNodeInstance::createPrimitive("QML/QtObject", + 1, + 0, + nodeInstanceServer->context()); + if (object == nullptr) //Fallback for Qt 5 + object = Internal::ObjectNodeInstance::createPrimitive("QtQml/QtObject", + 2, + 0, + nodeInstanceServer->context()); } }