2 files changed, 9 insertions, 4 deletions
diff --git a/src/platformsupport/input/libinput/libinput.pri b/src/platformsupport/input/libinput/libinput.pri
index 35d962ff3c..aeba6c725a 100644
--- a/src/platformsupport/input/libinput/libinput.pri
+++ b/src/platformsupport/input/libinput/libinput.pri
@@ -13,6 +13,8 @@ SOURCES += \
 INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV $$QMAKE_INCDIR_LIBINPUT
 LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV $$QMAKE_LIBS_LIBINPUT
 
+INCLUDEPATH += $$PWD/../shared
+
 contains(QT_CONFIG, xkbcommon-evdev) {
     INCLUDEPATH += $$QMAKE_INCDIR_XKBCOMMON_EVDEV
     LIBS_PRIVATE += $$QMAKE_LIBS_XKBCOMMON_EVDEV
diff --git a/src/platformsupport/input/libinput/qlibinputtouch.cpp b/src/platformsupport/input/libinput/qlibinputtouch.cpp
index 1e82ce5c91..42925a18e1 100644
--- a/src/platformsupport/input/libinput/qlibinputtouch.cpp
+++ b/src/platformsupport/input/libinput/qlibinputtouch.cpp
@@ -64,11 +64,14 @@ QLibInputTouch::DeviceState *QLibInputTouch::deviceState(libinput_event_touch *e
 
 static inline QPointF getPos(libinput_event_touch *e)
 {
+    // TODO Map to correct screen using QTouchOutputMapping.
+    // Perhaps investigate libinput_device_get_output_name as well.
+    // For now just use the primary screen.
     QScreen *screen = QGuiApplication::primaryScreen();
-    const QSize screenSize = QHighDpi::toNativePixels(screen->geometry().size(), screen);
-    const double x = libinput_event_touch_get_x_transformed(e, screenSize.width());
-    const double y = libinput_event_touch_get_y_transformed(e, screenSize.height());
-    return QPointF(x, y);
+    const QRect geom = QHighDpi::toNativePixels(screen->geometry(), screen);
+    const double x = libinput_event_touch_get_x_transformed(e, geom.width());
+    const double y = libinput_event_touch_get_y_transformed(e, geom.height());
+    return geom.topLeft() + QPointF(x, y);
 }
 
 void QLibInputTouch::registerDevice(libinput_device *dev)