From 4106737900476f9c98325252ec9fedcad602af92 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 9 Aug 2019 15:41:55 +0200 Subject: 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 --- tests/auto/input/mousedevice/tst_mousedevice.cpp | 38 ++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'tests/auto/input') 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)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Vertical); + auto eventList = QList() + << 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)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList() + << 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)(QPointF(500.0f, 500.0f), - 0, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), QPoint(), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN -- cgit v1.2.3