Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59

Change-Id: Ic0edcce1268b9cc47c91364eeb84e3b3f7dfe134
2020-05-12 10:04:10 +02:00
parent 0e7a1e6650 c9b5671754
commit 03a1282bdd
217 changed files with 310 additions and 766 deletions
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -768,6 +768,8 @@ QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QQmlC
            qWarning() << error;
    }

+    object->setProperty("__designer_url__", QUrl::fromLocalFile(componentPath));
+
    return object;
 }