summaryrefslogtreecommitdiffstats
path: root/tests/manual/qtabletevent/device_information
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/qtabletevent/device_information')
-rw-r--r--tests/manual/qtabletevent/device_information/CMakeLists.txt33
-rw-r--r--tests/manual/qtabletevent/device_information/main.cpp2
-rw-r--r--tests/manual/qtabletevent/device_information/tabletwidget.cpp5
-rw-r--r--tests/manual/qtabletevent/device_information/tabletwidget.h2
4 files changed, 25 insertions, 17 deletions
diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt
index 02c0789ffe..a0583b1f93 100644
--- a/tests/manual/qtabletevent/device_information/CMakeLists.txt
+++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt
@@ -1,15 +1,20 @@
-# Generated from device_information.pro.
-
-#####################################################################
-## device_information Binary:
-#####################################################################
-
-qt_internal_add_manual_test(device_information
- GUI
- SOURCES
- main.cpp
- tabletwidget.cpp tabletwidget.h
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::Widgets
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+project(tablet_device_info)
+cmake_minimum_required(VERSION 3.19)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
+
+qt_add_executable(tablet_device_info
+ main.cpp
+ tabletwidget.h tabletwidget.cpp
+)
+
+set_target_properties(tablet_device_info PROPERTIES
+ AUTOMOC TRUE
+)
+
+target_link_libraries(tablet_device_info PUBLIC
+ Qt::Widgets
)
diff --git a/tests/manual/qtabletevent/device_information/main.cpp b/tests/manual/qtabletevent/device_information/main.cpp
index 5d9b4d83fc..cb18e79eac 100644
--- a/tests/manual/qtabletevent/device_information/main.cpp
+++ b/tests/manual/qtabletevent/device_information/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QApplication>
#include <QDebug>
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
index c9ada64487..747c807e02 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include "tabletwidget.h"
#include <QPainter>
@@ -57,6 +57,8 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev)
mPos = event->pos();
mGPos = event->globalPosition();
mTimestamp = event->timestamp();
+ if (isVisible())
+ update();
}
break;
case QEvent::Wheel:
@@ -107,6 +109,7 @@ void TabletWidget::paintEvent(QPaintEvent *)
eventInfo << QString("Device info missing");
} else {
eventInfo << QString("Seat: %1").arg(mDev->seatName());
+ eventInfo << QString("Name: %1").arg(mDev->name());
eventInfo << QString("Device type: %1").arg(deviceTypeToString(mDev->type()));
eventInfo << QString("Pointer type: %1").arg(pointerTypeToString(mDev->pointerType()));
eventInfo << QString("Capabilities: %1").arg(pointerCapabilitiesToString(mDev->capabilities()));
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h
index 9eee4bf639..477ae55b1b 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.h
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#ifndef TABLETWIDGET_H
#define TABLETWIDGET_H