From a89390342f36b95acb6c98a80e6af76b9c42879a Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 11 Jul 2011 12:19:54 +0200
Subject: [PATCH] QmlDesigner.dragTool: improve usablity of drag and drop

If the parent is not set yet we do not need to reparent, yet.

Change-Id: I2ad743e775ebac57dde1b3600ff6af6378fc9da2
Reviewed-on: http://codereview.qt.nokia.com/1408
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
---
 src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 38556c08cb1..eb5b7f99c34 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -404,7 +404,7 @@ void  DragTool::move(QPointF scenePos)
         return;
 
     FormEditorItem *containerItem = calculateContainer(scenePos - QPoint(2, 2), m_movingItem.data());
-    if (containerItem &&
+    if (containerItem && m_movingItem->parentItem() &&
        containerItem != m_movingItem->parentItem()) {
 
         m_moveManipulator.reparentTo(containerItem);