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/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.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/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h')
| -rw-r--r-- | src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h index b62aad9e..959113f1 100644 --- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h +++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h @@ -56,11 +56,11 @@ public: IIOSensorProxyOrientationSensor(QSensor *sensor); ~IIOSensorProxyOrientationSensor(); - void start() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; + void start() override; + void stop() override; protected: - void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE; + void updateProperties(const QVariantMap &changedProperties) override; private: void updateOrientation(const QString &orientation); |