diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:31:30 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:32:04 +0200 |
| commit | 15e924486a410780fefbc5a95fae8886e3190925 (patch) | |
| tree | c6d784f1c528a0fe75367db415240fc4dfe5c73a /src/plugins/sensors/sensorfw/sensorfwrotationsensor.h | |
| parent | ea7af7f00886f77941b81262e597c3b7f3477f48 (diff) | |
| parent | 4c29e9149a583b48e563ad44b59666a9d45f9347 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
src/sensors/qcompass.cpp
Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwrotationsensor.h')
| -rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwrotationsensor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h index dd415201..944d2c11 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h @@ -61,6 +61,7 @@ public: protected: bool doConnect() Q_DECL_OVERRIDE; QString sensorName() const Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; virtual void init(); private: QRotationReading m_reading; |