diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_maemo.cpp --- a/qtmobility/src/systeminfo/qsysteminfo_maemo.cpp Thu May 27 13:42:11 2010 +0300 +++ b/qtmobility/src/systeminfo/qsysteminfo_maemo.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) ** @@ -38,8 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include -#include +#include "qsysteminfo.h" +#include "qsysteminfo_maemo_p.h" + #include #include #include @@ -166,18 +167,6 @@ } } 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("video0")) { - featureSupported = true; - } - } - break; case QSystemInfo::HapticsFeature: { // if(halIsAvailable) { @@ -1023,23 +1012,23 @@ emit currentProfileChanged(currentProfile()); } -void QSystemDeviceInfoPrivate::profileChanged(bool, bool, QString profile, QList values) +void QSystemDeviceInfoPrivate::profileChanged(bool changed, bool active, QString profile, QList values) { - const QSystemDeviceInfo::Profile previousProfile = currentProfile(); - - profileName = profile; - foreach (const ProfileDataValue value, values) { - if (value.key == "ringing.alert.type") - silentProfile = value.val == "silent"; - else if (value.key == "vibrating.alert.enabled") - vibratingAlertEnabled = value.val == "On"; - else if (value.key == "ringing.alert.volume") - ringingAlertVolume = value.val.toInt(); + if (active) { + const QSystemDeviceInfo::Profile previousProfile = currentProfile(); + profileName = profile; + foreach (const ProfileDataValue value, values) { + if (value.key == "ringing.alert.type") + silentProfile = value.val == "silent"; + else if (value.key == "vibrating.alert.enabled") + vibratingAlertEnabled = value.val == "On"; + else if (value.key == "ringing.alert.volume") + ringingAlertVolume = value.val.toInt(); + } + QSystemDeviceInfo::Profile newProfile = currentProfile(); + if (previousProfile != newProfile) + emit currentProfileChanged(newProfile); } - - QSystemDeviceInfo::Profile newProfile = currentProfile(); - if (previousProfile != newProfile) - emit currentProfileChanged(newProfile); } #endif