diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-09 15:41:55 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-09-10 13:45:52 +0200 |
| commit | 4106737900476f9c98325252ec9fedcad602af92 (patch) | |
| tree | 4b0c1433ec6c0ced08d11cbd74e0bbf099fcf3b9 /tests/auto/input | |
| parent | 67f7a83d935539e185b4bf26e7c1c79e254497a8 (diff) | |
Remove usages of deprecated APIs
- Replaced the deprecated constructors of QWheelEvent with the
non-deprecated one.
- Fixed the docs of deprecated APIs to compile conditionally, only
when those APIs are enabled.
Task-number: QTBUG-76491
Change-Id: Id45b3f0dd2720d901c808fc69adbafb80e096fac
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/input')
| -rw-r--r-- | tests/auto/input/mousedevice/tst_mousedevice.cpp | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/tests/auto/input/mousedevice/tst_mousedevice.cpp b/tests/auto/input/mousedevice/tst_mousedevice.cpp index 64447d0de..fac317a49 100644 --- a/tests/auto/input/mousedevice/tst_mousedevice.cpp +++ b/tests/auto/input/mousedevice/tst_mousedevice.cpp @@ -178,11 +178,14 @@ private Q_SLOTS: Qt3DInput::Input::MouseDevice backendMouseDevice; // WHEN - auto eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Vertical); + auto eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), + QPoint(0, 120), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN @@ -191,11 +194,14 @@ private Q_SLOTS: QCOMPARE(backendMouseDevice.sensitivity(), 0.1f); // WHEN - eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), + QPoint(120, 0), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN @@ -204,11 +210,13 @@ private Q_SLOTS: QCOMPARE(backendMouseDevice.sensitivity(), 0.1f); // WHEN - eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 0, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), QPoint(), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN |