summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-02-10 11:24:46 +0100
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-02-10 10:36:34 +0000
commitece316fb648155414d2fddada32b7cb9445c49c7 (patch)
treec617a2bf06553d75b08f1a830e15da835ef4c9f6 /share
parentbb525e5fc90b16f74bcbe9cf783bdd8441dff94b (diff)
downloadqt-creator-ece316fb648155414d2fddada32b7cb9445c49c7.tar.gz
QmlDesigner: Adding dummydata as context property
The dummyContextObject is now set as the context object Change-Id: I710f1ef36b8c97cc481b9109a775f06d9e03f6b6 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 26115635d4..f475ca338a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -482,6 +482,7 @@ void NodeInstanceServer::setupDummyData(const QUrl &fileUrl)
if (m_dummyContextObject.isNull())
setupDefaultDummyData();
+ rootContext()->setContextObject(m_dummyContextObject);
}
void NodeInstanceServer::setupDefaultDummyData()