From c08d826ed1afc8e4c1289b8daebca9dc0e17fbc2 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 7 Apr 2010 11:10:27 +1000
Subject: Initialize drag movement correctly if drag.target is set after mouse
 move.

Task-number: QTBUG-9638
---
 src/declarative/graphicsitems/qdeclarativemousearea.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index b89c427..06ecb61 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -412,8 +412,8 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
     if (d->drag && d->drag->target()) {
         if (!d->moved) {
-            if (d->dragX) d->startX = drag()->target()->x();
-            if (d->dragY) d->startY = drag()->target()->y();
+            d->startX = drag()->target()->x();
+            d->startY = drag()->target()->y();
         }
 
         QPointF startLocalPos;
@@ -455,8 +455,8 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 y = drag()->ymax();
             drag()->target()->setY(y);
         }
+        d->moved = true;
     }
-    d->moved = true;
     QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
     emit positionChanged(&me);
 }
-- 
cgit v0.12