diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
| commit | 6001ef3bb9cdf41c5375a22cdaee85fffdf3b644 (patch) | |
| tree | f37a69fc24d84522a0cb388802a38022a3cd9943 /src/gui/kernel/qwidget.cpp | |
| parent | d1a28d167295958a4404fab37d60ef530c692590 (diff) | |
| parent | d7b34583926e3bd751120a4b827cd5ba6667dea3 (diff) | |
| download | Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.zip Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.gz Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.bz2 | |
Merge commit 'oslo-staging-1/4.6' into master-mainline
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 49292ac..685d7ec 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -8388,9 +8388,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! @@ -8419,6 +8420,7 @@ bool QWidget::event(QEvent *event) Qt::LeftButton, touchEvent->modifiers()); (void) QApplication::sendEvent(this, &mouseEvent); +#endif // Q_WS_MAC break; } case QEvent::Gesture: |