aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
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/layoutnodeinstance.cpp
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/layoutnodeinstance.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp21
1 files changed, 5 insertions, 16 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
index 0bf1ed0e39..6eb3cbc7ea 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
@@ -46,22 +46,6 @@ bool LayoutNodeInstance::isResizable() const
return true;
}
-void LayoutNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value)
-{
- if (name == "move" || name == "add" || name == "populate")
- return;
-
- QuickItemNodeInstance::setPropertyVariant(name, value);
-}
-
-void LayoutNodeInstance::setPropertyBinding(const PropertyName &name, const QString &expression)
-{
- if (name == "move" || name == "add" || name == "populate")
- return;
-
- QuickItemNodeInstance::setPropertyBinding(name, expression);
-}
-
LayoutNodeInstance::Pointer LayoutNodeInstance::create(QObject *object)
{
QQuickItem *item = qobject_cast<QQuickItem*>(object);
@@ -87,5 +71,10 @@ void LayoutNodeInstance::refreshLayoutable()
}
+PropertyNameList LayoutNodeInstance::ignoredProperties() const
+{
+ return PropertyNameList() << "move" << "add" << "populate";
+}
+
}
} // namespace QmlDesigner