diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:44:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:44:46 +0100 |
| commit | fd3e100b9d3c75181454593e57508039d4ecdab5 (patch) | |
| tree | 4c018ba5d578f7dd9a69a3c9be48dd5c11d43e36 /src/plugins/sensors/android/src/androidtemperature.h | |
| parent | 9e51dc1175a696eba275d9bec6fc60148a942db6 (diff) | |
| parent | 400ad25d72b8b2d9a10057953a88d7d64b9bc0a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic6de4c970ff0cb3d5d1b8b6eff4ee020ba485d99
Diffstat (limited to 'src/plugins/sensors/android/src/androidtemperature.h')
| -rw-r--r-- | src/plugins/sensors/android/src/androidtemperature.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sensors/android/src/androidtemperature.h b/src/plugins/sensors/android/src/androidtemperature.h index 667169cd..67250931 100644 --- a/src/plugins/sensors/android/src/androidtemperature.h +++ b/src/plugins/sensors/android/src/androidtemperature.h @@ -51,8 +51,8 @@ class AndroidTemperature : public AndroidCommonSensor<QAmbientTemperatureReading public: AndroidTemperature(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDTEMPERATURE_H |