diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-12-02 15:52:55 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-12-02 16:35:18 +0000 |
| commit | a86cb745261d96ce71da306b0b373db726876961 (patch) | |
| tree | 1128ebed53bb78a394c4662411eb02ffea727c15 | |
| parent | 728605b2ae903f786dd26346635d368fddef0c69 (diff) | |
| download | qt-creator-a86cb745261d96ce71da306b0b373db726876961.tar.gz | |
QmlDesigner: QtObject is in QML now
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp index 8ea0eaf806..e7229f06a6 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()); } } |