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/sensorgestures/shake | |
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/sensorgestures/shake')
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakerecognizer.h | 10 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h index 46d16326..21c85664 100644 --- a/src/plugins/sensorgestures/shake/qshakerecognizer.h +++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h @@ -64,12 +64,12 @@ public: QShakeSensorGestureRecognizer(QObject *parent = 0); ~QShakeSensorGestureRecognizer(); - void create() Q_DECL_OVERRIDE; + void create() override; - QString id() const Q_DECL_OVERRIDE; - bool start() Q_DECL_OVERRIDE; - bool stop() Q_DECL_OVERRIDE; - bool isActive() Q_DECL_OVERRIDE; + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; QTimer *timer; int timerTimeout; diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index 397ae071..96814eb8 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -55,11 +55,11 @@ public: explicit QShakeSensorGesturePlugin(); ~QShakeSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE; + QList <QSensorGestureRecognizer *> createRecognizers() override; QStringList gestureSignals() const; - QStringList supportedIds() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE { return "ShakeGestures"; } + QStringList supportedIds() const override; + QString name() const override { return "ShakeGestures"; } }; #endif // QSHAKESENSORGESTUREPLUGIN_H |