--- a/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,7 +44,7 @@
 #include <QDir>
 
 #if !defined(QT_NO_DBUS)
-#include <qhalservice_linux_p.h>
+#include "qhalservice_linux_p.h"
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusError>
@@ -191,16 +191,7 @@
          break;
      case QSystemInfo::FmradioFeature :
          {
-             const QString sysPath = "/sys/class/video4linux/";
-             const QDir sysDir(sysPath);
-             QStringList filters;
-             filters << "*";
-             QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-             foreach(const QString dir, sysList) {
-                if (dir.contains("radio")) {
-                    featureSupported = true;
-                }
-            }
+             featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("radio*")).empty());
          }
          break;
      case QSystemInfo::IrFeature :
@@ -284,14 +275,7 @@
          break;
      case QSystemInfo::VideoOutFeature :
          {
-             const QString sysPath = "/sys/class/video4linux/";
-             const QDir sysDir(sysPath);
-             QStringList filters;
-             filters << "*";
-             const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-             if(sysList.contains("video")) {
-                 featureSupported = true;
-             }
+             featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("video*")).empty());
          }
          break;
      case QSystemInfo::HapticsFeature: