diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:00:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:01:00 +0100 |
| commit | f8c5c1356465f503e1a8357ceff01bb956d51c9e (patch) | |
| tree | 36b5bc1c2d5767b3eee0820c70b91fdfc57287b3 /src/platformsupport | |
| parent | eda28621f6c1a68774719f382be53ec109123b18 (diff) | |
| parent | 153726bc167406414f589f72bea76c3229cfa815 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/input/libinput/qlibinputkeyboard_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h index 9e09bccd79..14ae71b545 100644 --- a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h +++ b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h @@ -43,7 +43,9 @@ #include <QtCore/QPoint> #include <QtCore/QTimer> -#ifndef QT_NO_XKBCOMMON_EVDEV +#include <QtGui/private/qtguiglobal_p.h> + +#if QT_CONFIG(xkbcommon) #include <xkbcommon/xkbcommon.h> #endif @@ -70,7 +72,7 @@ public: void processKey(libinput_event_keyboard *e); -#ifndef QT_NO_XKBCOMMON_EVDEV +#if QT_CONFIG(xkbcommon) void handleRepeat(); private: |