diff options
Diffstat (limited to 'tests/manual/qtabletevent')
11 files changed, 39 insertions, 31 deletions
diff --git a/tests/manual/qtabletevent/CMakeLists.txt b/tests/manual/qtabletevent/CMakeLists.txt index 422664e2a4..df4a66c8f1 100644 --- a/tests/manual/qtabletevent/CMakeLists.txt +++ b/tests/manual/qtabletevent/CMakeLists.txt @@ -1,5 +1,6 @@ -# Generated from qtabletevent.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause -#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject' +#add_subdirectory(device_information) # TODO: no member named 'staticQtMetaObject' add_subdirectory(event_compression) add_subdirectory(regular_widgets) 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 diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt index 8f5b6a3962..74fa0fb790 100644 --- a/tests/manual/qtabletevent/event_compression/CMakeLists.txt +++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from event_compression.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## event_compression Binary: @@ -8,7 +9,7 @@ qt_internal_add_manual_test(event_compression SOURCES main.cpp mousestatwidget.cpp mousestatwidget.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Test Qt::Widgets diff --git a/tests/manual/qtabletevent/event_compression/main.cpp b/tests/manual/qtabletevent/event_compression/main.cpp index fe805cab4a..13edf8e704 100644 --- a/tests/manual/qtabletevent/event_compression/main.cpp +++ b/tests/manual/qtabletevent/event_compression/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 "mousestatwidget.h" diff --git a/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp b/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp index 63ae1e0e81..483ce0019d 100644 --- a/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp +++ b/tests/manual/qtabletevent/event_compression/mousestatwidget.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 "mousestatwidget.h" diff --git a/tests/manual/qtabletevent/event_compression/mousestatwidget.h b/tests/manual/qtabletevent/event_compression/mousestatwidget.h index 1130ea1688..f204a753a3 100644 --- a/tests/manual/qtabletevent/event_compression/mousestatwidget.h +++ b/tests/manual/qtabletevent/event_compression/mousestatwidget.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 MOUSESTATWIDGET_H #define MOUSESTATWIDGET_H diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt index 786e061322..d95c33df18 100644 --- a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt +++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from regular_widgets.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## regular_widgets Binary: @@ -8,12 +9,9 @@ qt_internal_add_manual_test(regular_widgets GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Gui Qt::GuiPrivate Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:regular_widgets.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp index 68f204088f..3aee2bcdba 100644 --- a/tests/manual/qtabletevent/regular_widgets/main.cpp +++ b/tests/manual/qtabletevent/regular_widgets/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 <QAction> #include <QApplication> @@ -152,7 +152,7 @@ void EventReportWidget::paintEvent(QPaintEvent *) p.setPen(Qt::white); QPainterPath ellipse; ellipse.addEllipse(0, 0, halfLineSpacing * 5, halfLineSpacing); - for (const TabletPoint &t : qAsConst(m_points)) { + for (const TabletPoint &t : std::as_const(m_points)) { if (geom.contains(t.pos)) { QPainterPath pp; pp.addEllipse(t.pos, halfLineSpacing, halfLineSpacing); |