diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:24 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-03-11 11:27:49 +0100 |
| commit | 116d68f105db025f56c1fd5115ff4924bc22d7c2 (patch) | |
| tree | ae04596b19c34eccc60ff7477da6a0166c5f82b1 /src/platformsupport/devicediscovery | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
| parent | bd3c82f8db4391fc1d6d3338827356143fd598dd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/plugin/qlibrary.cpp
src/corelib/plugin/qlibrary_unix.cpp
src/corelib/plugin/qpluginloader.cpp
Change-Id: I866feaaa2a4936ee5389679724c8471a5b4b583d
Diffstat (limited to 'src/platformsupport/devicediscovery')
| -rw-r--r-- | src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp index 478fe61a44..9cf5c9096e 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp +++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp @@ -46,7 +46,11 @@ #include <QSocketNotifier> #include <QLoggingCategory> +#ifdef Q_OS_FREEBSD +#include <dev/evdev/input.h> +#else #include <linux/input.h> +#endif QT_BEGIN_NAMESPACE |