aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@nokia.com>2011-07-27 17:29:01 +0200
committerMarco Bubke <marco.bubke@nokia.com>2011-07-27 20:14:24 +0200
commit776f19025e9f6fe6c0b0460476382735fbdae363 (patch)
tree9375cb0f24011421f7839089624e73b7b85146af /share
parent2125638107bf9f0a53ea61304e800531b8522003 (diff)
QmlDesigner.NodeInstances: Add a default dummy context
Task-number: QTCREATORBUG-5631 Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b Reviewed-on: http://codereview.qt.nokia.com/2300 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp33
-rw-r--r--share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h1
2 files changed, 34 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
index 694d95cc994..a0a9957fb48 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
@@ -400,6 +400,39 @@ void NodeInstanceServer::setupDummyData(const QUrl &fileUrl)
loadDummyDataContext(dummyDataDirectory);
}
}
+
+ if (m_dummyContextObject.isNull())
+ setupDefaultDummyData();
+}
+
+void NodeInstanceServer::setupDefaultDummyData()
+{
+ QDeclarativeComponent component(engine());
+ QByteArray defaultContextObjectArray("import QtQuick 1.0\n"
+ "import QmlDesigner 1.0\n"
+ "DummyContextObject {\n"
+ " parent: QtObject {\n"
+ " property real width: 360\n"
+ " property real height: 640\n"
+ " }\n"
+ "}\n");
+
+ component.setData(defaultContextObjectArray, fileUrl());
+ m_dummyContextObject = component.create();
+
+ if (component.isError()) {
+ QList<QDeclarativeError> errors = component.errors();
+ foreach (const QDeclarativeError &error, errors) {
+ qWarning() << error;
+ }
+ }
+
+ if (m_dummyContextObject) {
+ qWarning() << "Loaded default dummy context object.";
+ m_dummyContextObject->setParent(this);
+ }
+
+ refreshBindings();
}
QList<ServerNodeInstance> NodeInstanceServer::setupInstances(const CreateSceneCommand &command)
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
index d9c49b35bf6..4b8ac356135 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
@@ -193,6 +193,7 @@ protected:
void setupFileUrl(const QUrl &fileUrl);
void setupImports(const QVector<AddImportContainer> &container);
void setupDummyData(const QUrl &fileUrl);
+ void setupDefaultDummyData();
QList<ServerNodeInstance> setupInstances(const CreateSceneCommand &command);
QList<QDeclarativeContext*> allSubContextsForObject(QObject *object);