diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
| commit | ec2c6c0f13004bc1bba92f14443228778da287a0 (patch) | |
| tree | 5c4e2621091ad7bbd31e6ffb6a277c1aaee39b55 /src/input/backend/mousedevice_p.h | |
| parent | 5476bc6b4b6a12c921da502c24c4e078b04dd3b3 (diff) | |
| parent | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devwip/particles
Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397
Diffstat (limited to 'src/input/backend/mousedevice_p.h')
| -rw-r--r-- | src/input/backend/mousedevice_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h index 723945554..02a6d916e 100644 --- a/src/input/backend/mousedevice_p.h +++ b/src/input/backend/mousedevice_p.h @@ -76,6 +76,7 @@ public: bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; void updateMouseEvents(const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events); + void updateWheelEvents(const QList<QT_PREPEND_NAMESPACE(QWheelEvent)> &events); protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; @@ -90,6 +91,8 @@ private: MouseState() : xAxis(0.0f) , yAxis(0.0f) + , wXAxis(0.0f) + , wYAxis(0.0f) , leftPressed(false) , rightPressed(false) , centerPressed(false) @@ -97,6 +100,8 @@ private: float xAxis; float yAxis; + float wXAxis; + float wYAxis; bool leftPressed; bool rightPressed; bool centerPressed; |