diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:44:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:44:46 +0100 |
| commit | fd3e100b9d3c75181454593e57508039d4ecdab5 (patch) | |
| tree | 4c018ba5d578f7dd9a69a3c9be48dd5c11d43e36 /src/plugins/sensorgestures/qtsensors/qshake2recognizer.h | |
| parent | 9e51dc1175a696eba275d9bec6fc60148a942db6 (diff) | |
| parent | 400ad25d72b8b2d9a10057953a88d7d64b9bc0a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic6de4c970ff0cb3d5d1b8b6eff4ee020ba485d99
Diffstat (limited to 'src/plugins/sensorgestures/qtsensors/qshake2recognizer.h')
| -rw-r--r-- | src/plugins/sensorgestures/qtsensors/qshake2recognizer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h index 232d2adc..647b713f 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h @@ -73,12 +73,12 @@ public: QShake2SensorGestureRecognizer(QObject *parent = 0); ~QShake2SensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; int timerTimeout; |