diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 16:05:18 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 16:05:18 (GMT) |
commit | cfa391673c47f94c42bfac70a6a1f4d17eff06e8 (patch) | |
tree | 21ef6fd4c029871636bc185a3d301e1a3ffb7b45 /src/declarative/graphicsitems | |
parent | b9d27071bc9754ce6809b7367e8ed7fa921eeb7b (diff) | |
parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
download | Qt-cfa391673c47f94c42bfac70a6a1f4d17eff06e8.zip Qt-cfa391673c47f94c42bfac70a6a1f4d17eff06e8.tar.gz Qt-cfa391673c47f94c42bfac70a6a1f4d17eff06e8.tar.bz2 |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 1b7dce0..d9edd11 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -566,7 +566,8 @@ void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even if (!d->absorb) { QDeclarativeItem::mouseDoubleClickEvent(event); } else { - d->doubleClick = true; + 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()); |