Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: Ia804a9a975baea0f971c7bea004c5ce403d1adee

1 files changed, 6 insertions, 0 deletions

diff --git a/src/plugins/sensors/ios/iosmagnetometer.mm b/src/plugins/sensors/ios/iosmagnetometer.mm
index 95f85ae1..3cd8b10e 100644
--- a/src/plugins/sensors/ios/iosmagnetometer.mm
+++ b/src/plugins/sensors/ios/iosmagnetometer.mm
@@ -91,6 +91,9 @@ void IOSMagnetometer::timerEvent(QTimerEvent *)
         CMDeviceMotion *deviceMotion = m_motionManager.deviceMotion;
         CMCalibratedMagneticField calibratedField = deviceMotion.magneticField;
         field = calibratedField.field;
+        // skip update if NaN
+        if (field.x != field.x || field.y != field.y || field.z != field.z)
+            return;
         m_reading.setTimestamp(quint64(deviceMotion.timestamp * 1e6));
 
         switch (calibratedField.accuracy) {
@@ -110,6 +113,9 @@ void IOSMagnetometer::timerEvent(QTimerEvent *)
     } else {
         CMMagnetometerData *data = m_motionManager.magnetometerData;
         field = data.magneticField;
+        // skip update if NaN
+        if (field.x != field.x || field.y != field.y || field.z != field.z)
+            return;
         m_reading.setTimestamp(quint64(data.timestamp * 1e6));
         m_reading.setCalibrationLevel(1.0);
     }