From 7a304015bd57372eae1e615f0048c5b84b7c9842 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 14 May 2012 17:04:44 -0700 Subject: input: Use UDev or specific device paths Keyboard,mouse and touch plugins using evdev now either use udev for device discovery or the plugin arguments for fixed device paths. Change-Id: I72606ad48c15c55a49724a82f7bc285dd3984c43 Reviewed-by: Girish Ramakrishnan --- src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugins/generic/evdevkeyboard') diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp index 04ce2a73a0..6a891a4cb7 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -65,12 +65,11 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString & QStringList devices; foreach (const QString &arg, args) { - if (arg.startsWith(QLatin1String("udev")) && arg.contains(QLatin1String("no"))) { - useUDev = false; - } else if (arg.startsWith(QLatin1String("/dev/"))) { + if (arg.startsWith(QLatin1String("/dev/"))) { // if device is specified try to use it devices.append(arg); args.removeAll(arg); + useUDev = false; } } -- cgit v1.2.3