diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
| commit | 67dea992954a4499d81ee63457263f913ca92c50 (patch) | |
| tree | 352e5879cd0bd50f3fe27117530ea1f601b97079 /src/input/backend/mousehandler.cpp | |
| parent | ba2974a8abdf0048d2c8ecc821d369c74598e39f (diff) | |
| parent | d947ef04bc162d9f1816afb6188e8ef0a30c5143 (diff) | |
Merge 5.9 into 5.9.0
Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
Diffstat (limited to 'src/input/backend/mousehandler.cpp')
| -rw-r--r-- | src/input/backend/mousehandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index a0619aaf2..c492dcf28 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -91,6 +91,7 @@ void MouseHandler::mouseEvent(const QMouseEventPtr &event) notifyObservers(e); } +#if QT_CONFIG(wheelevent) void MouseHandler::wheelEvent(const QWheelEventPtr &event) { auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId()); @@ -99,6 +100,7 @@ void MouseHandler::wheelEvent(const QWheelEventPtr &event) e->setValue(QVariant::fromValue(event)); notifyObservers(e); } +#endif void MouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { |