Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	.qmake.conf

Change-Id: Ic691e11af371acfb7706ee218665fb5a9f96a9c3

1 files changed, 9 insertions, 3 deletions

diff --git a/src/plugins/sensors/android/androidaccelerometer.cpp b/src/plugins/sensors/android/androidaccelerometer.cpp
index c9f5141e..f38e0047 100644
--- a/src/plugins/sensors/android/androidaccelerometer.cpp
+++ b/src/plugins/sensors/android/androidaccelerometer.cpp
@@ -82,18 +82,24 @@ void AndroidAccelerometer::applyAccelerationMode(QAccelerometer::AccelerationMod
 {
     switch (accelerationMode) {
     case QAccelerometer::Gravity:
-        if (!(m_accelerationModes & Gravity))
+        if (!(m_accelerationModes & Gravity)) {
             qWarning() << "Gravity sensor missing";
+            return;
+        }
         setSensorType(ASENSOR_TYPE_GRAVITY);
         break;
     case QAccelerometer::User:
-        if (!(m_accelerationModes & LinearAcceleration))
+        if (!(m_accelerationModes & LinearAcceleration)) {
             qWarning() << "Linear acceleration sensor missing";
+            return;
+        }
         setSensorType(ASENSOR_TYPE_LINEAR_ACCELERATION);
         break;
     case QAccelerometer::Combined:
-        if (!(m_accelerationModes & Accelerometer))
+        if (!(m_accelerationModes & Accelerometer)) {
             qWarning() << "Accelerometer sensor missing";
+            return;
+        }
         setSensorType(ASENSOR_TYPE_ACCELEROMETER);
         break;
     }