From 3d5e9a0ba1f731352eeead2beecf600d27810e74 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 22 Apr 2016 13:25:16 +0200 Subject: Tablet device_information manual test: show wheel events received MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a bug that proximity events are generating them spuriously; this is a way of testing it. Task-number: QTBUG-52921 Change-Id: I490dfcf8d5b325f612b733e29fd49de9418bb19e Reviewed-by: Morten Johan Sørvig --- tests/manual/qtabletevent/device_information/tabletwidget.cpp | 8 +++++++- tests/manual/qtabletevent/device_information/tabletwidget.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/manual/qtabletevent/device_information') diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp index f1d838f01d..0b33f4e7c6 100644 --- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp +++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp @@ -38,7 +38,7 @@ #include #include -TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo) +TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0) { QPalette newPalette = palette(); newPalette.setColor(QPalette::Window, Qt::white); @@ -87,6 +87,10 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev) mGPos = event->globalPos(); mTimestamp = event->timestamp(); } + break; + case QEvent::Wheel: + ++mWheelEventCount; + break; default: break; } @@ -181,6 +185,8 @@ void TabletWidget::paintEvent(QPaintEvent *) eventInfo << QString("z: %1").arg(QString::number(mZ)); eventInfo << QString("Unique Id: %1").arg(QString::number(mUnique)); + + eventInfo << QString("Total wheel events: %1").arg(QString::number(mWheelEventCount)); } QString text = eventInfo.join("\n"); diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h index 95631be57b..97dea8d389 100644 --- a/tests/manual/qtabletevent/device_information/tabletwidget.h +++ b/tests/manual/qtabletevent/device_information/tabletwidget.h @@ -66,6 +66,7 @@ private: qint64 mUnique; bool mMouseToo; ulong mTimestamp; + int mWheelEventCount; }; #endif // TABLETWIDGET_H -- cgit v1.2.3