diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 12:34:54 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 12:54:10 +0200 |
| commit | 3acdb7891b900158ca62f3c9d673757aa8688f74 (patch) | |
| tree | 17fbaa3f21b302f11020d10c9851d8b88afb9707 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances | |
| parent | 8114a588476445f5611e415b245be4c50b653e54 (diff) | |
| parent | ad4c5e02589dbe8f0c2adcebbc24d7242cb0de4f (diff) | |
Merge remote-tracking branch 'origin/qds-1.59'
Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index e018e7bf31a..840b71c6711 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -768,7 +768,8 @@ QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QQmlC qWarning() << error; } - object->setProperty("__designer_url__", QUrl::fromLocalFile(componentPath)); + if (object) + object->setProperty("__designer_url__", QUrl::fromLocalFile(componentPath)); return object; } |