Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

1 files changed, 10 insertions, 3 deletions

diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
index cec596ebb2..6b98ed30a9 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
@@ -538,9 +538,16 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
             it.next();
             Contact &contact(it.value());
             int key = m_typeB ? it.key() : contact.trackingId;
-            if (!m_contacts.contains(key)) {
-                contact.state = Qt::TouchPointReleased;
-                addTouchPoint(contact, &combinedStates);
+            if (m_typeB) {
+                if (contact.trackingId != m_contacts[key].trackingId && contact.state) {
+                    contact.state = Qt::TouchPointReleased;
+                    addTouchPoint(contact, &combinedStates);
+                }
+            } else {
+                if (!m_contacts.contains(key)) {
+                    contact.state = Qt::TouchPointReleased;
+                    addTouchPoint(contact, &combinedStates);
+                }
             }
         }