aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2014-04-17 17:41:18 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-04-17 18:02:28 +0200
commite9096120ad69202eaf17b392376de798e6a71cd3 (patch)
tree226b8f88a29f45b7211da977e4e9bc97db29ebeb /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
parent1c7fc450cc971cc1b62156f689099c0697a3293c (diff)
QmlDesigner: Fix ignored properties for reparenting
We reparented into ignored properties. Now there is a more general mechanism to prevent this. Task-number: QTCREATORBUG-11970 Change-Id: Icbd5877dc13c65963079eb3ab67e48bb92056b53 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
index f591bf61402..1f178f51c19 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
@@ -189,6 +189,8 @@ public:
virtual void updateAllDirtyNodesRecursive();
+ virtual PropertyNameList ignoredProperties() const;
+
protected:
explicit ObjectNodeInstance(QObject *object);
void doResetProperty(const PropertyName &propertyName);