diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-20 21:15:31 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-21 03:54:54 +0000 |
| commit | 45a65cbeb2775da71d4e7b417b45d54341a3ee7f (patch) | |
| tree | ca30805fe8c5d3d8b2790d6fd7fc87ee8fd4399a | |
| parent | 291e8e729ee7a28e579c3aea22fd4482cd271ed7 (diff) | |
QGuiAppPriv: don't clear target and window for TouchCancel
It's nice not to leave garbage in QPointingDevicePrivate::activePoints
between events; on the other hand, this garbage doesn't matter, because
every press event sets the target and window independently, without
caring what was stored there from before. But it was wrong to clear
it before we've even delivered the TouchCancel event.
Pick-to: 6.0
Pick-to: 6.0.0
Change-Id: I924039a7c7a8ed75f420d1837c63dc19d3cc98b6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index d396f11efb..05933bac6a 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2816,8 +2816,6 @@ void QGuiApplicationPrivate::processTouchEvent(QWindowSystemInterfacePrivate::To QWindow *w = mut.window(); if (w) windowsNeedingCancel.insert(w); - mut.setWindow(nullptr); - mut.setTarget(nullptr); } for (QSet<QWindow *>::const_iterator winIt = windowsNeedingCancel.constBegin(), |