diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:21:39 +0100 |
| commit | 19d7ab8d277500e88baf3b23edd62dee4d5d9c46 (patch) | |
| tree | b5589d3797c263adc057e2583f9a94e5801b4e21 /src/plugins/sensors/android/src/androidcompass.cpp | |
| parent | 26446d7dc33c44e2f84fe95381f02aca87c1a537 (diff) | |
| parent | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (diff) | |
| download | qtsensors-19d7ab8d277500e88baf3b23edd62dee4d5d9c46.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/sensors/ios/ios.pro
Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e
Diffstat (limited to 'src/plugins/sensors/android/src/androidcompass.cpp')
| -rw-r--r-- | src/plugins/sensors/android/src/androidcompass.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp index 462695b..e98f048 100644 --- a/src/plugins/sensors/android/src/androidcompass.cpp +++ b/src/plugins/sensors/android/src/androidcompass.cpp @@ -64,12 +64,12 @@ public: AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this); } - void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE + void onAccuracyChanged(jint accuracy) override { Q_UNUSED(accuracy); } - void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE + void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override { if (size < 3) return; @@ -104,12 +104,12 @@ public: AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this); } - void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE + void onAccuracyChanged(jint accuracy) override { Q_UNUSED(accuracy); } - void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE + void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override { if (size < 3) return; |