From e6d0d202f3c3f296b6865a63d87a7c9182b63ae2 Mon Sep 17 00:00:00 2001 From: Oleksandr Tymoshenko Date: Tue, 4 Oct 2016 14:33:05 -0700 Subject: Add evdev support for FreeBSD FreeBSD 12 has evdev implementation dropin-compatible with Linux's /dev/input. Add #ifdef wrappers around platform-specific headers. Change-Id: Ia50c3f2d2e9f0f3689a92e327305d5e7547e9407 Reviewed-by: Laszlo Agocs --- config.tests/unix/evdev/evdev.cpp | 4 ++++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp | 4 ++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 4 ++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 4 ++++ src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp | 4 ++++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp | 4 ++++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/config.tests/unix/evdev/evdev.cpp b/config.tests/unix/evdev/evdev.cpp index 8d7f608dd4..b00b1a8141 100644 --- a/config.tests/unix/evdev/evdev.cpp +++ b/config.tests/unix/evdev/evdev.cpp @@ -37,8 +37,12 @@ ** ****************************************************************************/ +#if defined(__FreeBSD__) +#include +#else #include #include +#endif enum { e1 = ABS_PRESSURE, diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp index 5c72dbe7e2..a1575677f5 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp +++ b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp @@ -47,7 +47,11 @@ #include #include +#ifdef Q_OS_FREEBSD +#include +#else #include +#endif #include /* android (and perhaps some other linux-derived stuff) don't define everything diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h index bc0485232d..17bf0fb797 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h @@ -52,7 +52,11 @@ // #include "qnamespace.h" +#ifdef Q_OS_FREEBSD +#include +#else #include "linux/input.h" +#endif // no QT_BEGIN_NAMESPACE, since we include it internally... diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 0eb6fc0847..5c87cb7c9c 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -49,7 +49,11 @@ #include #include +#ifdef Q_OS_FREEBSD +#include +#else #include +#endif QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index d5ea04bee8..9b4bcf1575 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -53,8 +53,12 @@ #include +#ifdef Q_OS_FREEBSD +#include +#else #include #include +#endif #define TEST_BIT(array, bit) (array[bit/8] & (1<<(bit%8))) diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp index dc03daedda..86f8a00b13 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp +++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp @@ -45,7 +45,11 @@ #include #include #include +#ifdef Q_OS_FREEBSD +#include +#else #include +#endif QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index d53a317fc5..6870fd3dde 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -48,7 +48,11 @@ #include #include #include +#ifdef Q_OS_FREEBSD +#include +#else #include +#endif #if QT_CONFIG(mtdev) extern "C" { -- cgit v1.2.3