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/qmlpressuresensor.h | |
parent | 26446d7dc33c44e2f84fe95381f02aca87c1a537 (diff) | |
parent | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (diff) | |
download | qtsensors-19d7ab8d277500e88baf3b23edd62dee4d5d9c46.tar.gz |
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/qmlpressuresensor.h')
-rw-r--r-- | src/imports/sensors/qmlpressuresensor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/sensors/qmlpressuresensor.h b/src/imports/sensors/qmlpressuresensor.h index 4a99b46..6304d69 100644 --- a/src/imports/sensors/qmlpressuresensor.h +++ b/src/imports/sensors/qmlpressuresensor.h @@ -53,8 +53,8 @@ public: ~QmlPressureSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QPressureSensor *m_sensor; }; @@ -76,8 +76,8 @@ Q_SIGNALS: Q_REVISION(1) void temperatureChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QPressureSensor *m_sensor; qreal m_pressure; |