diff options
Diffstat (limited to 'tests/auto/gui/painting/qpolygon')
-rw-r--r-- | tests/auto/gui/painting/qpolygon/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/gui/painting/qpolygon/qpolygon.pro | 8 | ||||
-rw-r--r-- | tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp | 51 |
3 files changed, 31 insertions, 45 deletions
diff --git a/tests/auto/gui/painting/qpolygon/CMakeLists.txt b/tests/auto/gui/painting/qpolygon/CMakeLists.txt index 83477e0689..42b108efcd 100644 --- a/tests/auto/gui/painting/qpolygon/CMakeLists.txt +++ b/tests/auto/gui/painting/qpolygon/CMakeLists.txt @@ -1,20 +1,27 @@ -# Generated from qpolygon.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qpolygon Test: ##################################################################### -qt_add_test(tst_qpolygon +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qpolygon LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_qpolygon SOURCES tst_qpolygon.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui ) ## Scopes: ##################################################################### -qt_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY - PUBLIC_LIBRARIES +qt_internal_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY + LIBRARIES m ) diff --git a/tests/auto/gui/painting/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro deleted file mode 100644 index 6bda0f8709..0000000000 --- a/tests/auto/gui/painting/qpolygon/qpolygon.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpolygon -QT += testlib -SOURCES += tst_qpolygon.cpp - -unix:!darwin:!haiku:!integrity: LIBS += -lm - - diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp index a33e1559de..cd24135ac6 100644 --- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp +++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> #include <qpolygon.h> #include <qpainterpath.h> @@ -41,6 +16,7 @@ class tst_QPolygon : public QObject private slots: void constructors(); + void toPolygonF(); void boundingRect_data(); void boundingRect(); void boundingRectF_data(); @@ -80,6 +56,17 @@ void tst_QPolygon::constructors() constructors_helperF(QRectF(1, 2, 3, 4)); } +void tst_QPolygon::toPolygonF() +{ + const QPolygon p = {{1, 1}, {-1, 1}, {-1, -1}, {1, -1}}; + auto pf = p.toPolygonF(); + static_assert(std::is_same_v<decltype(pf), QPolygonF>); + QCOMPARE(pf.size(), p.size()); + auto p2 = pf.toPolygon(); + static_assert(std::is_same_v<decltype(p2), QPolygon>); + QCOMPARE(p, p2); +} + void tst_QPolygon::boundingRect_data() { QTest::addColumn<QPolygon>("poly"); @@ -181,8 +168,8 @@ void tst_QPolygon::swap() QPolygon p2(QList<QPoint>() << QPoint(0, 0) << QPoint(0, 10) << QPoint(10, 10) << QPoint(10, 0)); p1.swap(p2); - QCOMPARE(p1.count(),4); - QCOMPARE(p2.count(),3); + QCOMPARE(p1.size(),4); + QCOMPARE(p2.size(),3); } void tst_QPolygon::intersections_data() |