diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /src/platformsupport/fbconvenience | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'src/platformsupport/fbconvenience')
| -rw-r--r-- | src/platformsupport/fbconvenience/qfbvthandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platformsupport/fbconvenience/qfbvthandler.cpp b/src/platformsupport/fbconvenience/qfbvthandler.cpp index 2429cb7c5c..102bc91647 100644 --- a/src/platformsupport/fbconvenience/qfbvthandler.cpp +++ b/src/platformsupport/fbconvenience/qfbvthandler.cpp @@ -39,8 +39,9 @@ #include "qfbvthandler_p.h" #include <QtCore/QSocketNotifier> +#include <QtCore/private/qglobal_p.h> -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && (!defined(QT_NO_EVDEV) || !defined(QT_NO_LIBINPUT)) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && (QT_CONFIG(evdev) || QT_CONFIG(libinput)) #define VTH_ENABLED |