summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
-rw-r--r--src/gui/kernel/qapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 3c9d2a8..ca0054f 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -4037,7 +4037,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
break;
#endif
case QEvent::TouchBegin:
- // Note: TouchUpdate and TouchEnd events are sent to d->currentMultitouchWidget and never propagated
+ // Note: TouchUpdate and TouchEnd events are never propagated
{
QWidget *widget = static_cast<QWidget *>(receiver);
QTouchEvent *touchEvent = static_cast<QTouchEvent *>(e);
@@ -4051,9 +4051,9 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
while (widget) {
// first, try to deliver the touch event
- touchEvent->ignore();
- res = widget->testAttribute(Qt::WA_AcceptTouchEvents)
- && d->notify_helper(widget, touchEvent);
+ bool acceptTouchEvents = widget->testAttribute(Qt::WA_AcceptTouchEvents);
+ touchEvent->setAccepted(acceptTouchEvents);
+ res = acceptTouchEvents && d->notify_helper(widget, touchEvent);
eventAccepted = touchEvent->isAccepted();
widget->setAttribute(Qt::WA_AcceptedTouchBeginEvent, res && eventAccepted);
touchEvent->spont = false;