diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 01:28:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 01:28:23 (GMT) |
| commit | ef5eabdd58a9f584cff8b4e70b7eea583957114c (patch) | |
| tree | cc42c5a4bb3201c552c465176bcbca8ae77fcea5 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
| parent | 00ffa83f2dbe3b3019dc564d6b4447f83b5d655f (diff) | |
| parent | 7253fe0cb58699d911f7f5b2dca28dd7182b1ef9 (diff) | |
| download | Qt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.zip Qt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.tar.gz Qt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Dragging in nested views no longer works as expected
Fix implicit height not growing when pre-edit text wraps.
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 474126d..ea7c366 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1553,7 +1553,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) d->handleMouseMoveEvent(&mouseEvent); break; case QEvent::GraphicsSceneMousePress: - if (d->pressed) // we are already pressed - this is a delayed replay + if (d->pressed && !event->spontaneous()) // we are already pressed - this is a delayed replay return false; d->handleMousePressEvent(&mouseEvent); |