diff options
| author | Johannes Zellner <johannes.zellner@nokia.com> | 2012-05-21 15:41:58 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 07:15:02 +0200 |
| commit | ce5c1db2d3db7d7c7af28e9053ca591f76c6101c (patch) | |
| tree | 60ef0eac7ad658e9715f2a940dbf7c5a3b6787a4 /src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h | |
| parent | 7dd64fd2bbb18a424577543307f2821ace963b8b (diff) | |
udev: UDevHelper becomes DeviceDiscovery
Rename QUDeviceHelper to QDeviceDiscovery and add a static device
discovery fallback in case we dont have udev. The fallback so far only
scans /dev/input/event* and /dev/dri/card* at startup and detects device
nodes only by device path.
Change-Id: I7a423910b30ae16a10d8f1f47b86c6b4d2c2ec36
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h')
| -rw-r--r-- | src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h index a505ce834e7..e76814209ed 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h @@ -44,9 +44,7 @@ #include "qevdevkeyboardhandler.h" -#ifndef QT_NO_LIBUDEV -#include <QtPlatformSupport/private/qudevicehelper_p.h> -#endif // QT_NO_LIBUDEV +#include <QtPlatformSupport/private/qdevicediscovery_p.h> #include <QObject> #include <QHash> @@ -70,9 +68,7 @@ private slots: private: QString m_spec; QHash<QString,QEvdevKeyboardHandler*> m_keyboards; -#ifndef QT_NO_LIBUDEV - QUDeviceHelper *m_udeviceHelper; -#endif // QT_NO_LIBUDEV + QDeviceDiscovery *m_deviceDiscovery; }; QT_END_HEADER |