diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 09:59:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 09:59:35 +0100 |
| commit | 502bdb3930dabf9d9087ea1eaa671e2cdf2e2d58 (patch) | |
| tree | 42c85426426c49f1640090c6c3ed054dce4193ff | |
| parent | 2c55174f267fccdd6bf74171b0da312f895c5a62 (diff) | |
| parent | 13bbe6ea378d127b9b1d70e2858e41e86e754dc7 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: Ia2221357b99132510f60d6fca171982a64b31516
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h index 4ef6552..c82dda6 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h @@ -78,8 +78,8 @@ public: bool handleGenericMotionEvent(jobject event) override; protected: - bool start(); - void stop(); + bool start() override; + void stop() override; public: struct Mapping { |