diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-20 08:20:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-20 08:20:47 +0200 |
| commit | 73f880d3934650de18def4eee615162d47416674 (patch) | |
| tree | 07acedd242b334aba49df57a2983c07224b6d385 /src/platformsupport | |
| parent | 6234286925153279ca259cec04429fa584187b16 (diff) | |
| parent | 0d9f43d534983411e37a9f3912de272a4a6ced64 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/makefile.h
Change-Id: I4c2deac4f6376c85f5e4fe7fb0ccc9ab9a013cd7
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index a6e5c9b5ab..bf044229ff 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com> ** Contact: https://www.qt.io/licensing/ ** @@ -77,7 +77,7 @@ Q_LOGGING_CATEGORY(qLcEvdevTouch, "qt.qpa.input") #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ #endif #ifndef ABS_MT_POSITION_X -#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ +#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ #endif #ifndef ABS_MT_POSITION_Y #define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ @@ -91,6 +91,9 @@ Q_LOGGING_CATEGORY(qLcEvdevTouch, "qt.qpa.input") #ifndef ABS_MT_TRACKING_ID #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ #endif +#ifndef ABS_MT_PRESSURE +#define ABS_MT_PRESSURE 0x3a +#endif #ifndef SYN_MT_REPORT #define SYN_MT_REPORT 2 #endif |