summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-03-30 16:52:12 +0200
committerKai Koehne <kai.koehne@nokia.com>2010-03-30 16:54:54 +0200
commitaff7d3fdf8c78488d85bffba4c72f64d92f23f74 (patch)
tree9b44b33911c8e06bb4a91c01348fb1b74160948e
parent17884141da0be90cd69a46310703520d35a011ba (diff)
downloadqt-creator-aff7d3fdf8c78488d85bffba4c72f64d92f23f74.tar.gz
QmlDesigner: Fix 'jumping around' when moving items in the Visual Editor
This regression was caused by Qt change 6f88388db4e8e2, which disabled the automatic setting of QObject::parent Reviewed-by: Marco Bubke
-rw-r--r--src/plugins/qmldesigner/core/instances/nodeinstance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstance.cpp b/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
index bb14cbbdf2..72f4fbd605 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
@@ -261,7 +261,7 @@ NodeInstance NodeInstance::parent() const
bool NodeInstance::hasParent() const
{
- return m_nodeInstance->object()->parent();
+ return m_nodeInstance->parent();
}
/*!