diff options
author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2012-02-28 17:24:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 17:56:40 +0100 |
commit | 107f888feb062db0f3384d2b56410524918a1016 (patch) | |
tree | dc0ba1b83094e05091bb96583edc8b2ae713133b /src/imports | |
parent | d356955d96351e14cad290457c3ba0e7ecc9a170 (diff) |
Add a work-around for QTBUG-24552.
In short, for signals with enums as the parameters, the enums can not
be recognized if the signals are connected using Connections element.
This commit should be reverted once QTBUG-24552 gets fixed.
Change-Id: Ibc08cca4c8796817625a8c2fed22988d897817d0
Reviewed-by: Yang Li <yang.12.li@nokia.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/systeminfo/qdeclarativebatteryinfo_p.h | 6 | ||||
-rw-r--r-- | src/imports/systeminfo/qdeclarativenetworkinfo_p.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/systeminfo/qdeclarativebatteryinfo_p.h b/src/imports/systeminfo/qdeclarativebatteryinfo_p.h index a59d9b5f..62e50961 100644 --- a/src/imports/systeminfo/qdeclarativebatteryinfo_p.h +++ b/src/imports/systeminfo/qdeclarativebatteryinfo_p.h @@ -159,13 +159,13 @@ Q_SIGNALS: void monitorBatteryStatusChanged(); void batteryCountChanged(int count); - void chargerTypeChanged(ChargerType type); - void chargingStateChanged(int battery, ChargingState state); + void chargerTypeChanged(int type); + void chargingStateChanged(int battery, int state); void currentFlowChanged(int battery, int flow); void remainingCapacityChanged(int battery, int capacity); void remainingChargingTimeChanged(int battery, int seconds); void voltageChanged(int battery, int voltage); - void batteryStatusChanged(int battery, BatteryStatus status); + void batteryStatusChanged(int battery, int status); private Q_SLOTS: void _q_chargerTypeChanged(QBatteryInfo::ChargerType type); diff --git a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h index 27a71976..d3fc1fd4 100644 --- a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h +++ b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h @@ -173,15 +173,15 @@ Q_SIGNALS: void monitorNetworkNameChanged(); void cellIdChanged(int interfaceIndex, const QString &id); - void currentCellDataTechnologyChanged(int interfaceIndex, CellDataTechnology tech); + void currentCellDataTechnologyChanged(int interfaceIndex, int tech); void currentMobileCountryCodeChanged(int interfaceIndex, const QString &mcc); void currentMobileNetworkCodeChanged(int interfaceIndex, const QString &mnc); void currentNetworkModeChanged(); void locationAreaCodeChanged(int interfaceIndex, const QString &lac); - void networkInterfaceCountChanged(NetworkMode mode, int count); - void networkNameChanged(NetworkMode mode, int interfaceIndex, const QString &name); - void networkSignalStrengthChanged(NetworkMode mode, int interfaceIndex, int strength); - void networkStatusChanged(NetworkMode mode, int interfaceIndex, NetworkStatus status); + void networkInterfaceCountChanged(int mode, int count); + void networkNameChanged(int mode, int interfaceIndex, const QString &name); + void networkSignalStrengthChanged(int mode, int interfaceIndex, int strength); + void networkStatusChanged(int mode, int interfaceIndex, int status); private Q_SLOTS: void _q_currentCellDataTechnologyChanged(int interface, QNetworkInfo::CellDataTechnology tech); |