1 files changed, 8 insertions, 7 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index a0208ef..d9edd11 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -335,7 +335,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 
     If the \e accepted property of the \l {MouseEvent}{mouse} parameter is set to false
     in the handler, the onPressed/onReleased/onClicked handlers will be called for the second
-    click; otherwise they are supressed.  The accepted property defaults to true.
+    click; otherwise they are suppressed.  The accepted property defaults to true.
 */
 
 /*!
@@ -557,6 +557,7 @@ void QDeclarativeMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             ungrabMouse();
         setKeepMouseGrab(false);
     }
+    d->doubleClick = false;
 }
 
 void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
@@ -565,14 +566,13 @@ void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even
     if (!d->absorb) {
         QDeclarativeItem::mouseDoubleClickEvent(event);
     } else {
+        if (d->isDoubleClickConnected())
+            d->doubleClick = true;
         d->saveEvent(event);
         QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
         me.setAccepted(d->isDoubleClickConnected());
         emit this->doubleClicked(&me);
-        if (!me.isAccepted()) {
-            // Only deliver the press event if we haven't accepted the double click.
-            QDeclarativeItem::mouseDoubleClickEvent(event);
-        }
+        QDeclarativeItem::mouseDoubleClickEvent(event);
     }
 }
 
@@ -841,7 +841,8 @@ bool QDeclarativeMouseArea::setPressed(bool p)
         d->pressed = p;
         QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
         if (d->pressed) {
-            emit pressed(&me);
+            if (!d->doubleClick)
+                emit pressed(&me);
             me.setX(d->lastPos.x());
             me.setY(d->lastPos.y());
             emit mousePositionChanged(&me);
@@ -849,7 +850,7 @@ bool QDeclarativeMouseArea::setPressed(bool p)
             emit released(&me);
             me.setX(d->lastPos.x());
             me.setY(d->lastPos.y());
-            if (isclick && !d->longPress)
+            if (isclick && !d->longPress && !d->doubleClick)
                 emit clicked(&me);
         }