diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
| commit | 49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (patch) | |
| tree | f45126f94631d128a05817e8179ebbaaa607df60 /src/gui/widgets | |
| parent | a44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff) | |
| parent | 8280ed177d798aeaf82868ba6c7c8c4250051f1d (diff) | |
| download | Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.zip Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.gz Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/graphicsview/graphicsview.pro
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qabstractscrollarea.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp index f09768a..533a56b 100644 --- a/src/gui/widgets/qabstractscrollarea.cpp +++ b/src/gui/widgets/qabstractscrollarea.cpp @@ -934,6 +934,10 @@ bool QAbstractScrollArea::event(QEvent *e) case QEvent::DragMove: case QEvent::DragLeave: #endif + // ignore touch events in case they have been propagated from the viewport + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: return false; case QEvent::StyleChange: case QEvent::LayoutDirectionChange: @@ -974,6 +978,9 @@ bool QAbstractScrollArea::viewportEvent(QEvent *e) case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: case QEvent::MouseButtonDblClick: + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: case QEvent::MouseMove: case QEvent::ContextMenu: #ifndef QT_NO_WHEELEVENT |