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

Conflicts:
	src/plugins/sensors/ios/ios.pro

Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e

1 files changed, 4 insertions, 4 deletions

diff --git a/src/imports/sensors/qmlmagnetometer.h b/src/imports/sensors/qmlmagnetometer.h
index e55a365..3c3c2ba 100644
--- a/src/imports/sensors/qmlmagnetometer.h
+++ b/src/imports/sensors/qmlmagnetometer.h
@@ -61,9 +61,9 @@ Q_SIGNALS:
     void returnGeoValuesChanged(bool returnGeoValues);
 
 private:
-    QSensor *sensor() const Q_DECL_OVERRIDE;
+    QSensor *sensor() const override;
     QMagnetometer *m_sensor;
-    QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+    QmlSensorReading *createReading() const override;
 };
 
 class QmlMagnetometerReading : public QmlSensorReading
@@ -89,8 +89,8 @@ Q_SIGNALS:
     void calibrationLevelChanged();
 
 private:
-    QSensorReading *reading() const Q_DECL_OVERRIDE;
-    void readingUpdate() Q_DECL_OVERRIDE;
+    QSensorReading *reading() const override;
+    void readingUpdate() override;
     QMagnetometer *m_sensor;
     qreal m_x;
     qreal m_y;