diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:57 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:57 +0200 |
| commit | 2701763c003e9d2cc59a936491ab2fa8b6ff7f74 (patch) | |
| tree | 0f4782ba43d8fa5a45e629ff20bf75542dd95deb /src/plugins/sensors/android/src/androidaccelerometer.cpp | |
| parent | 12ac3b3b4645bf781b31ea713c111a73239c4885 (diff) | |
| parent | 87b569ccc4df161e33d41f7a5f1f25eced6f65c3 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ia804a9a975baea0f971c7bea004c5ce403d1adee
Diffstat (limited to 'src/plugins/sensors/android/src/androidaccelerometer.cpp')
| -rw-r--r-- | src/plugins/sensors/android/src/androidaccelerometer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp index 76aa0278..74b3d6db 100644 --- a/src/plugins/sensors/android/src/androidaccelerometer.cpp +++ b/src/plugins/sensors/android/src/androidaccelerometer.cpp @@ -95,5 +95,8 @@ AndroidSensors::AndroidSensorType AndroidAccelerometer::modeToSensor(QAccelerome break; } + if (type != AndroidSensors::TYPE_ACCELEROMETER && !AndroidSensors::availableSensors().contains(type)) + type = AndroidSensors::TYPE_ACCELEROMETER; + return type; } |