diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:39 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:21:39 +0100 |
commit | 19d7ab8d277500e88baf3b23edd62dee4d5d9c46 (patch) | |
tree | b5589d3797c263adc057e2583f9a94e5801b4e21 /src/imports/sensors/qmlgyroscope.h | |
parent | 26446d7dc33c44e2f84fe95381f02aca87c1a537 (diff) | |
parent | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/sensors/ios/ios.pro
Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e
Diffstat (limited to 'src/imports/sensors/qmlgyroscope.h')
-rw-r--r-- | src/imports/sensors/qmlgyroscope.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/sensors/qmlgyroscope.h b/src/imports/sensors/qmlgyroscope.h index 9d3f5c79..010e4f04 100644 --- a/src/imports/sensors/qmlgyroscope.h +++ b/src/imports/sensors/qmlgyroscope.h @@ -55,9 +55,9 @@ public: private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QGyroscope *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlGyroscopeReading : public QmlSensorReading @@ -80,8 +80,8 @@ Q_SIGNALS: void zChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QGyroscope *m_sensor; qreal m_x; qreal m_y; |