diff options
Diffstat (limited to 'tests/manual/touch')
| -rw-r--r-- | tests/manual/touch/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/manual/touch/main.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 967e703a83..72ed405048 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from touch.pro. - ##################################################################### ## touch Binary: ##################################################################### @@ -15,6 +13,3 @@ qt_internal_add_manual_test(touch Qt::GuiPrivate Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:touch.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index 5bac1e8c91..dcc29799aa 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/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 <QAction> @@ -382,7 +382,7 @@ void TouchTestWidget::paintEvent(QPaintEvent *) const QRectF geom = QRectF(QPointF(0, 0), QSizeF(size())); painter.fillRect(geom, Qt::white); painter.drawRect(QRectF(geom.topLeft(), geom.bottomRight() - QPointF(1, 1))); - for (const Point &point : qAsConst(m_points)) { + for (const Point &point : std::as_const(m_points)) { if (geom.contains(point.pos)) { if (point.type == MouseRelease) drawEllipse(point.pos, point.horizontalDiameter, point.verticalDiameter, point.color(), painter); @@ -390,7 +390,7 @@ void TouchTestWidget::paintEvent(QPaintEvent *) fillEllipse(point.pos, point.horizontalDiameter, point.verticalDiameter, point.color(), painter); } } - for (const GesturePtr &gp : qAsConst(m_gestures)) + for (const GesturePtr &gp : std::as_const(m_gestures)) gp->draw(geom, painter); } |