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/sensors/qproximitysensor.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/sensors/qproximitysensor.h')
| -rw-r--r-- | src/sensors/qproximitysensor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 33cd4b2b..46a8b218 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter public: virtual bool filter(QProximityReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QProximitySensor : public QSensor |