diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
| commit | 5ae513c05a1b844745cc80834dac43f16bf62092 (patch) | |
| tree | b93601dd5daf3b18091069791c7d10057ffd7a92 /src/gui/graphicsview | |
| parent | 7a577ff67388413a882435c5cbd1ad6d1fa8393d (diff) | |
| parent | 7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (diff) | |
| download | Qt-5ae513c05a1b844745cc80834dac43f16bf62092.zip Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.gz Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 7b0722e..6c5623e 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -6100,8 +6100,15 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event) if (ev.isAccepted() || ev.isAccepted(g)) { conflictedGestures.remove(g); // mark the item as a gesture target - if (item) + if (item) { gestureTargets.insert(g, item.data()); + QHash<QGraphicsObject *, QSet<QGesture *> >::iterator it, e; + it = cachedItemGestures.begin(); + e = cachedItemGestures.end(); + for(; it != e; ++it) + it.value().remove(g); + cachedItemGestures[item.data()].insert(g); + } DEBUG() << "QGraphicsScenePrivate::gestureEventHandler:" << "override was accepted:" << g << item.data(); |