diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:37:40 +0200 |
| commit | 53fcf914e278ed4395a4873af2b64272c5d7882c (patch) | |
| tree | 6394dc7e3dffe2f8a93b0bf48610016c7917e905 /src/datavisualization/engine/qabstract3dgraph.h | |
| parent | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (diff) | |
| parent | 9546547495582628ba815a7d99e621d11ca84fa1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
Diffstat (limited to 'src/datavisualization/engine/qabstract3dgraph.h')
| -rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 87c93f5f..a7d7d2ac 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -206,7 +206,9 @@ protected: void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event); +#endif Q_SIGNALS: void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler); |