diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-06-21 12:22:53 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-06-21 12:22:53 (GMT) |
| commit | 6cb4929eb25191dd6d0dfe17ed4814e43acab788 (patch) | |
| tree | 4d1015fab1272127373c6c29117d916dd5fcb4ae /src/gui/graphicsview/qgraphicsscene.cpp | |
| parent | f0b74a1e78ccf52b0f6d7c13738918baff0eeef4 (diff) | |
| parent | 9a1a98ea193d822f0a356f6afc2cb50b87d22968 (diff) | |
| download | Qt-6cb4929eb25191dd6d0dfe17ed4814e43acab788.zip Qt-6cb4929eb25191dd6d0dfe17ed4814e43acab788.tar.gz Qt-6cb4929eb25191dd6d0dfe17ed4814e43acab788.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 6c5623e..ca3b56f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -6277,7 +6277,8 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original) { Q_ASSERT(original); QGraphicsItem *originalItem = gestureTargets.value(original); - Q_ASSERT(originalItem); + if (originalItem == 0) // we only act on accepted gestures, which implies it has a target. + return; // iterate over all active gestures and for each find the owner // if the owner is part of our sub-hierarchy, cancel it. |