diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2011-01-28 16:23:13 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2011-01-28 16:23:13 +1000 |
| commit | 125c2a152297baf6a89d07433d8420f940a54d49 (patch) | |
| tree | 7b90787022e22f447994401f1d53738ebbca8e6a /examples/sysinfo/dialog.cpp | |
| parent | fafb844a0818eae68382ef465529b965a8a4d1dd (diff) | |
| parent | e933139b17db8da0c1dbcab98176831ac1315cf7 (diff) | |
Merge branch 'master' of ../qtmobility
Conflicts:
doc/src/examples/sysinfo.qdoc
Diffstat (limited to 'examples/sysinfo/dialog.cpp')
| -rw-r--r-- | examples/sysinfo/dialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp index 670c17c5bf..767a703d7f 100644 --- a/examples/sysinfo/dialog.cpp +++ b/examples/sysinfo/dialog.cpp @@ -887,7 +887,9 @@ void Dialog::bluetoothChanged(bool b) void Dialog::setupBattery() { delete bi; + //! [batterystatus1] bi = new QSystemBatteryInfo(this); + //! [batterystatus1] connect(bi,SIGNAL(remainingCapacityPercentChanged(int)), this,SLOT(updateBatteryStatus(int))); @@ -912,10 +914,11 @@ void Dialog::setupBattery() connect(bi,SIGNAL(remainingChargingTimeChanged(int)), chargeTimelcdNumber,SLOT(display(int))); + //! [batterystatus2] chargerTypeChanged(bi->chargerType()); - currentBatStat = bi->batteryStatus(); + //! [batterystatus2] chargingStateChanged(bi->chargingState()); |