From e45ffd7bf6b05062590da039e0de64707d2fb536 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Thu, 26 Oct 2017 13:26:56 +0200
Subject: [PATCH] Xinput: Avoid misdetecting certain trackballs as tablets

The algorithm triggers on the word "cursor" in the device name, which
would also happen for devices from the manufacturer Cursor Controls.

Task-number: QTBUG-48034
Change-Id: I9645c0d0bc1fa951d0ea00480572fd0df0220eb5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index 6f20ec25e3..26a9ba8d26 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -220,7 +220,7 @@ void QXcbConnection::xi2SetupDevices()
             isTablet = true;
             tabletData.pointerType = QTabletEvent::Eraser;
             dbgType = QLatin1String("eraser");
-        } else if (name.contains("cursor")) {
+        } else if (name.contains("cursor") && !(name.contains("cursor controls") && name.contains("trackball"))) {
             isTablet = true;
             tabletData.pointerType = QTabletEvent::Cursor;
             dbgType = QLatin1String("cursor");