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/linux/linuxsysaccelerometer.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/linux/linuxsysaccelerometer.h')
| -rw-r--r-- | src/plugins/sensors/linux/linuxsysaccelerometer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.h b/src/plugins/sensors/linux/linuxsysaccelerometer.h index fbcc82e9..af89bf77 100644 --- a/src/plugins/sensors/linux/linuxsysaccelerometer.h +++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h @@ -53,10 +53,10 @@ public: LinuxSysAccelerometer(QSensor *sensor); ~LinuxSysAccelerometer(); - void start() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; + void start() override; + void stop() override; void poll(); - void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent * /*event*/) override; private: QAccelerometerReading m_reading; |