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/qmltest | |
| 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/qmltest')
| -rw-r--r-- | src/qmltest/quicktestevent.cpp | 4 | ||||
| -rw-r--r-- | src/qmltest/quicktestevent_p.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp index 2fccf3cd72..20ede936fa 100644 --- a/src/qmltest/quicktestevent.cpp +++ b/src/qmltest/quicktestevent.cpp @@ -146,6 +146,7 @@ namespace QtQuickTest } } +#ifndef QT_NO_WHEELEVENT static void mouseWheel(QWindow* window, QObject* item, Qt::MouseButtons buttons, Qt::KeyboardModifiers stateKey, QPointF _pos, int xDelta, int yDelta, int delay = -1) @@ -172,6 +173,7 @@ namespace QtQuickTest if (!qApp->notify(window, &we)) QTest::qWarn("Wheel event not accepted by receiving window"); } +#endif }; bool QuickTestEvent::mousePress @@ -188,6 +190,7 @@ bool QuickTestEvent::mousePress return true; } +#ifndef QT_NO_WHEELEVENT bool QuickTestEvent::mouseWheel( QObject *item, qreal x, qreal y, int buttons, int modifiers, int xDelta, int yDelta, int delay) @@ -200,6 +203,7 @@ bool QuickTestEvent::mouseWheel( QPointF(x, y), xDelta, yDelta, delay); return true; } +#endif bool QuickTestEvent::mouseRelease (QObject *item, qreal x, qreal y, int button, diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h index 9dfa66a54d..f72d9265b5 100644 --- a/src/qmltest/quicktestevent_p.h +++ b/src/qmltest/quicktestevent_p.h @@ -69,8 +69,10 @@ public Q_SLOTS: int modifiers, int delay); bool mouseMove(QObject *item, qreal x, qreal y, int delay, int buttons); +#ifndef QT_NO_WHEELEVENT bool mouseWheel(QObject *item, qreal x, qreal y, int buttons, int modifiers, int xDelta, int yDelta, int delay); +#endif private: QWindow *eventWindow(); |