From 3a0071e286a929e4bf1fdf1c9701fc311f4b6044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Sat, 9 Mar 2013 17:01:40 +0100 Subject: [PATCH] Added automatic input device discovery to kms plugin. Similar to what the EGLFS plugin does, to avoid having to explicitly specify which device to use for keyboard and mouse. Change-Id: I00502be8c767487490f3fd36fb06d3eb56548ada Reviewed-by: Pier Luigi Fiorini Reviewed-by: Andy Nichols --- src/plugins/platforms/kms/qkmsintegration.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/plugins/platforms/kms/qkmsintegration.cpp b/src/plugins/platforms/kms/qkmsintegration.cpp index 7bbfaad306..539363722d 100644 --- a/src/plugins/platforms/kms/qkmsintegration.cpp +++ b/src/plugins/platforms/kms/qkmsintegration.cpp @@ -48,6 +48,12 @@ #include "qkmsnativeinterface.h" #include "qkmsvthandler.h" +#if !defined(QT_NO_EVDEV) +#include +#include +#include +#endif + #include #include #include @@ -75,6 +81,12 @@ QKmsIntegration::QKmsIntegration() connect(m_deviceDiscovery, SIGNAL(deviceDetected(QString)), this, SLOT(addDevice(QString))); connect(m_deviceDiscovery, SIGNAL(deviceRemoved(QString)), this, SLOT(removeDevice(QString))); } + +#if !defined(QT_NO_EVDEV) + new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString() /* spec */, this); + new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString() /* spec */, this); + new QEvdevTouchScreenHandlerThread(QString() /* spec */, this); +#endif } QKmsIntegration::~QKmsIntegration()