diff options
| author | Volker Krause <volker.krause@kdab.com> | 2012-11-30 16:05:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-19 21:27:41 +0100 |
| commit | c103b1942984487b3764d2e6a3d082d53e268878 (patch) | |
| tree | 52bfcbe8e7014c537115ce7ba6b2b6fdcb0e036d /src/plugins | |
| parent | c8ef32e2b6cded37a6854b94a281464c1b7a298b (diff) | |
Compile with QT_NO_WHEELEVENT.
Change-Id: I2fbe6f45ba50e3db75bd02cfca47ddabfcd5fc49
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins')
5 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp index d05f4b9b59..93cbdf3018 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp @@ -166,6 +166,7 @@ void InspectTool::hoverMoveEvent(QMouseEvent *event) } } +#ifndef QT_NO_WHEELEVENT void InspectTool::wheelEvent(QWheelEvent *event) { if (event->orientation() != Qt::Vertical) @@ -184,6 +185,7 @@ void InspectTool::wheelEvent(QWheelEvent *event) } } } +#endif void InspectTool::keyReleaseEvent(QKeyEvent *event) { diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h index 5c480697af..5ed243d361 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h @@ -79,7 +79,9 @@ public: void mouseDoubleClickEvent(QMouseEvent *); void hoverMoveEvent(QMouseEvent *); +#ifndef QT_NO_WHEELEVENT void wheelEvent(QWheelEvent *); +#endif void keyPressEvent(QKeyEvent *) {} void keyReleaseEvent(QKeyEvent *); diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h index f29909baf0..6e7d0c09cb 100644 --- a/src/plugins/qmltooling/shared/abstracttool.h +++ b/src/plugins/qmltooling/shared/abstracttool.h @@ -74,7 +74,9 @@ public: virtual void mouseDoubleClickEvent(QMouseEvent *event) = 0; virtual void hoverMoveEvent(QMouseEvent *event) = 0; +#ifndef QT_NO_WHEELEVENT virtual void wheelEvent(QWheelEvent *event) = 0; +#endif virtual void keyPressEvent(QKeyEvent *event) = 0; virtual void keyReleaseEvent(QKeyEvent *keyEvent) = 0; diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp index ed207c5f26..c1d0cf1343 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp @@ -173,10 +173,12 @@ bool AbstractViewInspector::eventFilter(QObject *obj, QEvent *event) if (mouseDoubleClickEvent(static_cast<QMouseEvent*>(event))) return true; break; +#ifndef QT_NO_WHEELEVENT case QEvent::Wheel: if (wheelEvent(static_cast<QWheelEvent*>(event))) return true; break; +#endif case QEvent::TouchBegin: case QEvent::TouchUpdate: case QEvent::TouchEnd: @@ -244,12 +246,14 @@ bool AbstractViewInspector::mouseDoubleClickEvent(QMouseEvent *event) return true; } +#ifndef QT_NO_WHEELEVENT bool AbstractViewInspector::wheelEvent(QWheelEvent *event) { foreach (AbstractTool *tool, m_tools) tool->wheelEvent(event); return true; } +#endif bool AbstractViewInspector::touchEvent(QTouchEvent *event) { diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h index d98707eaca..e0524c880c 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.h +++ b/src/plugins/qmltooling/shared/abstractviewinspector.h @@ -107,7 +107,9 @@ protected: virtual bool keyPressEvent(QKeyEvent *event); virtual bool keyReleaseEvent(QKeyEvent *keyEvent); virtual bool mouseDoubleClickEvent(QMouseEvent *event); +#ifndef QT_NO_WHEELEVENT virtual bool wheelEvent(QWheelEvent *event); +#endif virtual bool touchEvent(QTouchEvent *event); virtual void setShowAppOnTop(bool) = 0; |