From 35c8a21fe49a06dca6287be82ec4608d35ea794c Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 13 Mar 2017 14:05:50 +0100 Subject: QTabletEvent manual test: add quit shortcut Change-Id: I73012ec2d02856e5bbbc27d269f89b3918dd7c2d Reviewed-by: Andy Shaw --- tests/manual/qtabletevent/device_information/tabletwidget.cpp | 3 ++- tests/manual/qtabletevent/device_information/tabletwidget.h | 2 ++ 2 files changed, 4 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 3a0b1e0f21..14d059abc1 100644 --- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp +++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp @@ -33,7 +33,7 @@ #include #include -TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0) +TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0), mQuitShortcut(QKeySequence::Quit, this) { QPalette newPalette = palette(); newPalette.setColor(QPalette::Window, Qt::white); @@ -41,6 +41,7 @@ TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCoun setPalette(newPalette); qApp->installEventFilter(this); resetAttributes(); + connect(&mQuitShortcut, SIGNAL(activated()), qApp, SLOT(quit())); } bool TabletWidget::eventFilter(QObject *, QEvent *ev) diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h index 0d27c2eea0..404be1289f 100644 --- a/tests/manual/qtabletevent/device_information/tabletwidget.h +++ b/tests/manual/qtabletevent/device_information/tabletwidget.h @@ -31,6 +31,7 @@ #include #include +#include // a widget showing the information of the last tablet event class TabletWidget : public QWidget @@ -64,6 +65,7 @@ private: bool mMouseToo; ulong mTimestamp; int mWheelEventCount; + QShortcut mQuitShortcut; }; #endif // TABLETWIDGET_H -- cgit v1.2.3