diff options
author | Johannes Zellner <johannes.zellner@nokia.com> | 2012-05-14 17:04:44 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 20:44:36 +0200 |
commit | 7a304015bd57372eae1e615f0048c5b84b7c9842 (patch) | |
tree | bbe00169dcfac564bc5bea42c6dbc807bc74baf2 /src/plugins/generic/evdevkeyboard | |
parent | 44724508c97445e308eb86b6e193ed50da13caee (diff) |
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 <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/generic/evdevkeyboard')
-rw-r--r-- | src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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; } } |