diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-18 13:32:39 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-18 13:32:39 (GMT) |
commit | 6cc1e0106845a0dfe9433c4413b3c064c73ccfe2 (patch) | |
tree | a0372fb3e03000dc1e1f93a4154adecd70fd5119 /src/gui/graphicsview/qgraphicsview.cpp | |
parent | 86edc526684d80e405bcd1c63b5a314b70408679 (diff) | |
parent | 537243d70de1474cf234880b215c75e83e80abcd (diff) | |
download | Qt-6cc1e0106845a0dfe9433c4413b3c064c73ccfe2.zip Qt-6cc1e0106845a0dfe9433c4413b3c064c73ccfe2.tar.gz Qt-6cc1e0106845a0dfe9433c4413b3c064c73ccfe2.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouch
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index b75619c..2babce9 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2875,6 +2875,7 @@ bool QGraphicsView::viewportEvent(QEvent *event) gestureEvent.setGestures(ev->gestures()); gestureEvent.setCancelledGestures(ev->cancelledGestures()); QApplication::sendEvent(d->scene, &gestureEvent); + event->setAccepted(gestureEvent.isAccepted()); if (gestureEvent.isAccepted()) return true; } |