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/datavisualizationqml2/abstractdeclarative.cpp | |
| 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/datavisualizationqml2/abstractdeclarative.cpp')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 7568fd30..9c7a7238 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -656,10 +656,12 @@ void AbstractDeclarative::mouseMoveEvent(QMouseEvent *event) m_controller->mouseMoveEvent(event, mousePos); } +#if QT_CONFIG(wheelevent) void AbstractDeclarative::wheelEvent(QWheelEvent *event) { m_controller->wheelEvent(event); } +#endif void AbstractDeclarative::checkWindowList(QQuickWindow *window) { |