summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-03 14:39:48 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-03 14:39:48 (GMT)
commitbb4baab526d938f6d8e64b698bd424d735b29629 (patch)
treed22e560f97c4e9ea2b7f5480749d1dce6fb3b43d
parentb93e3a34402aadc9d313fe64e18d7373cd50612c (diff)
downloadQt-bb4baab526d938f6d8e64b698bd424d735b29629.zip
Qt-bb4baab526d938f6d8e64b698bd424d735b29629.tar.gz
Qt-bb4baab526d938f6d8e64b698bd424d735b29629.tar.bz2
Make sure we handle RawTouch events sent to QApplication
... and not just to a widget
-rw-r--r--src/gui/kernel/qapplication.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 5f2992e..8fb8086 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3631,7 +3631,10 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
}
bool res = false;
- if (!receiver->isWidgetType()) {
+ if (e->type() == QEvent::RawTouch) {
+ res = d->translateRawTouchEvent(qobject_cast<QWidget *>(receiver),
+ static_cast<QTouchEvent *>(e));
+ } else if (!receiver->isWidgetType()) {
res = d->notify_helper(receiver, e);
} else switch (e->type()) {
#if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
@@ -4031,10 +4034,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
}
break;
#endif
- case QEvent::RawTouch:
- res = d->translateRawTouchEvent(qobject_cast<QWidget *>(receiver),
- static_cast<QTouchEvent *>(e));
- break;
case QEvent::TouchBegin:
// Note: TouchUpdate and TouchEnd events are sent to d->currentMultitouchWidget and never propagated
{