From d3a020fcc475e2a4560bbe3aff557fac601bd064 Mon Sep 17 00:00:00 2001 From: Sampo Saaristo Date: Thu, 24 Jan 2013 10:29:32 +0200 Subject: Fix typo in filename causing search for input device types to fail. Extra space in filename removed. Variable holding input method types intialized. Task-Number: QTMOBILITY-2088 Change-Id: I07f44ed29466b26f666556f1b072029560c49ca3 Reviewed-by: Lorn Potter --- src/systeminfo/linux/qsysteminfo_linux_common.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/systeminfo/linux/qsysteminfo_linux_common.cpp b/src/systeminfo/linux/qsysteminfo_linux_common.cpp index de6d4c8cb3..6c2b2e0194 100644 --- a/src/systeminfo/linux/qsysteminfo_linux_common.cpp +++ b/src/systeminfo/linux/qsysteminfo_linux_common.cpp @@ -2399,7 +2399,7 @@ QString QSystemDeviceInfoLinuxCommonPrivate::manufacturer() QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfoLinuxCommonPrivate::inputMethodType() { - QSystemDeviceInfo::InputMethodFlags methods ; + QSystemDeviceInfo::InputMethodFlags methods = 0x0; #if !defined(QT_NO_HAL) && !defined(Q_WS_MEEGO) if (halIsAvailable) { QHalInterface iface2; @@ -2447,7 +2447,7 @@ QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfoLinuxCommonPrivate::inputMe filters << "event*"; const QStringList inputList = inputDir.entryList(filters, QDir::Dirs, QDir::Name); foreach (const QString &inputFileName, inputList) { - QFile file(inputsPath + inputFileName+ " /device/name"); + QFile file(inputsPath + inputFileName + "/device/name"); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { qDebug()<<"File not opened"; } else { -- cgit v1.2.3