diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
| commit | b42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch) | |
| tree | e41b2eb449e0d0392e85603612836d935967f400 /src/gui/kernel/qwidget.cpp | |
| parent | 664c78144754c499d07a95c3914fd34202bf4b98 (diff) | |
| parent | 343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff) | |
| download | Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 21aae3e..e551a1d 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -8376,9 +8376,10 @@ bool QWidget::event(QEvent *event) case QEvent::TouchUpdate: case QEvent::TouchEnd: { +#ifndef Q_WS_MAC QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event); const QTouchEvent::TouchPoint &touchPoint = touchEvent->touchPoints().first(); - if (touchPoint.isPrimary()) + if (touchPoint.isPrimary() || touchEvent->deviceType() == QTouchEvent::TouchPad) break; // fake a mouse event! @@ -8407,6 +8408,7 @@ bool QWidget::event(QEvent *event) Qt::LeftButton, touchEvent->modifiers()); (void) QApplication::sendEvent(this, &mouseEvent); +#endif // Q_WS_MAC break; } case QEvent::Gesture: |