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 /tests/auto/qsensor/test_sensorimpl.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 'tests/auto/qsensor/test_sensorimpl.h')
| -rw-r--r-- | tests/auto/qsensor/test_sensorimpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h index 4e4df08..9587731 100644 --- a/tests/auto/qsensor/test_sensorimpl.h +++ b/tests/auto/qsensor/test_sensorimpl.h @@ -43,7 +43,7 @@ public: void start(); void stop(); - bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE; + bool isFeatureSupported(QSensor::Feature feature) const override; signals: void emitBusyChanged(); |