diff options
| author | Steffen Hahn <steffen.hahn@nokia.com> | 2012-05-09 11:22:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 13:55:30 +0200 |
| commit | 2ea0a3c52423407167839ae3d1805bade60d2d65 (patch) | |
| tree | 4c23cfcfc92735b2b315b00b7b7e4ae74839676f /src/imports | |
| parent | 5569a184e435e410f233486598cff5628b0d0930 (diff) | |
Continue support for monitorCurrentNetworkMode
Most of the NetworkInfo monitor properties were set to obsoleted in
https://codereview.qt-project.org/#change,19125 . It is important
for UI applications to have possiblity to control monitoring of
currentNetworkMode since its updates are polled.
This way polling can be completely disable for power saving or
performance reasons.
Change-Id: I02e102e135050f4b1a23b6e03fd500eb0d822978
Reviewed-by: Yang Li <yang.12.li@nokia.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/systeminfo/qdeclarativenetworkinfo.cpp | 2 | ||||
| -rw-r--r-- | src/imports/systeminfo/qdeclarativenetworkinfo_p.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/imports/systeminfo/qdeclarativenetworkinfo.cpp b/src/imports/systeminfo/qdeclarativenetworkinfo.cpp index c1da02cf..8d745b3e 100644 --- a/src/imports/systeminfo/qdeclarativenetworkinfo.cpp +++ b/src/imports/systeminfo/qdeclarativenetworkinfo.cpp @@ -131,8 +131,6 @@ void QDeclarativeNetworkInfo::setMonitorCurrentNetworkMode(bool monitor) */ QDeclarativeNetworkInfo::NetworkMode QDeclarativeNetworkInfo::currentNetworkMode() const { - connect(networkInfo, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), - this, SIGNAL(currentNetworkModeChanged()), Qt::UniqueConnection); return static_cast<QDeclarativeNetworkInfo::NetworkMode>(networkInfo->currentNetworkMode()); } diff --git a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h index 426f4450..aee11e2a 100644 --- a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h +++ b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h @@ -69,11 +69,11 @@ class QDeclarativeNetworkInfo : public QObject Q_PROPERTY(bool monitorNetworkSignalStrength READ monitorNetworkSignalStrength WRITE setMonitorNetworkSignalStrength NOTIFY monitorNetworkSignalStrengthChanged) Q_PROPERTY(bool monitorNetworkStatus READ monitorNetworkStatus WRITE setMonitorNetworkStatus NOTIFY monitorNetworkStatusChanged) Q_PROPERTY(bool monitorNetworkName READ monitorNetworkName WRITE setMonitorNetworkName NOTIFY monitorNetworkNameChanged) + Q_PROPERTY(bool monitorCurrentNetworkMode READ monitorCurrentNetworkMode WRITE setMonitorCurrentNetworkMode NOTIFY monitorCurrentNetworkModeChanged) Q_PROPERTY(NetworkMode currentNetworkMode READ currentNetworkMode NOTIFY currentNetworkModeChanged) // obsoleted - Q_PROPERTY(bool monitorCurrentNetworkMode READ monitorCurrentNetworkMode WRITE setMonitorCurrentNetworkMode NOTIFY monitorCurrentNetworkModeChanged) Q_PROPERTY(bool monitorNetworkInterfaceCount READ monitorNetworkInterfaceCount WRITE setMonitorNetworkInterfaceCount NOTIFY monitorNetworkInterfaceCountChanged) Q_PROPERTY(bool monitorCurrentCellDataTechnology READ monitorCurrentCellDataTechnology WRITE setMonitorCurrentCellDataTechnology NOTIFY monitorCurrentCellDataTechnologyChanged) Q_PROPERTY(bool monitorCellId READ monitorCellId WRITE setMonitorCellId NOTIFY monitorCellIdChanged) |