summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-11-20 21:15:31 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-21 05:53:35 +0000
commitedef70185c8a46fea205b781828058c7c0e03326 (patch)
treeae13a4fa0b97eed24b5e80da472b578cdfc56d2b
parent9379e47831bd634aa046cf9a21542371ddde5c66 (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. Change-Id: I924039a7c7a8ed75f420d1837c63dc19d3cc98b6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 45a65cbeb2775da71d4e7b417b45d54341a3ee7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/gui/kernel/qguiapplication.cpp2
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(),