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/qmlholstersensor.h b/src/imports/sensors/qmlholstersensor.h
index 8b6eef73..630d1d85 100644
--- a/src/imports/sensors/qmlholstersensor.h
+++ b/src/imports/sensors/qmlholstersensor.h
@@ -53,8 +53,8 @@ public:
     ~QmlHolsterSensor();
 
 private:
-    QSensor *sensor() const Q_DECL_OVERRIDE;
-    QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+    QSensor *sensor() const override;
+    QmlSensorReading *createReading() const override;
 
     QHolsterSensor *m_sensor;
 };
@@ -73,8 +73,8 @@ Q_SIGNALS:
     void holsteredChanged();
 
 private:
-    QSensorReading *reading() const Q_DECL_OVERRIDE;
-    void readingUpdate() Q_DECL_OVERRIDE;
+    QSensorReading *reading() const override;
+    void readingUpdate() override;
 
     QHolsterSensor *m_sensor;
     bool m_holstered;