aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-05-28 14:14:07 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-05-30 14:11:57 +0200
commitb97422b710be8489c3798febcc82dc8cc6b86c3d (patch)
tree1a80913bc447b570852666f88aa98a71d48b793e /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
parent21c821806db143239d1824af42eac2dcb216c76f (diff)
QmlDesigner: Add container item support in node instances
Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
index be1dde6e3a..a40019c579 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -315,6 +315,11 @@ QRectF ServerNodeInstance::boundingRect() const
return boundingRect;
}
+QRectF ServerNodeInstance::contentItemBoundingRect() const
+{
+ return m_nodeInstance->contentItemBoundingBox();
+}
+
void ServerNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value)
{
m_nodeInstance->setPropertyVariant(name, value);
@@ -515,6 +520,11 @@ QTransform ServerNodeInstance::contentTransform() const
return m_nodeInstance->contentTransform();
}
+QTransform ServerNodeInstance::contentItemTransform() const
+{
+ return m_nodeInstance->contentItemTransform();
+}
+
double ServerNodeInstance::rotation() const
{
return m_nodeInstance->rotation();
@@ -631,11 +641,6 @@ qint32 ServerNodeInstance::instanceId() const
}
}
-QObject* ServerNodeInstance::testHandle() const
-{
- return internalObject();
-}
-
QList<ServerNodeInstance> ServerNodeInstance::stateInstances() const
{
return m_nodeInstance->stateInstances();