diff options
Diffstat (limited to 'tests/manual/lance')
-rw-r--r-- | tests/manual/lance/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/manual/lance/README | 4 | ||||
-rw-r--r-- | tests/manual/lance/interactivewidget.cpp | 32 | ||||
-rw-r--r-- | tests/manual/lance/interactivewidget.h | 29 | ||||
-rw-r--r-- | tests/manual/lance/lance.pro | 4 | ||||
-rw-r--r-- | tests/manual/lance/main.cpp | 30 | ||||
-rw-r--r-- | tests/manual/lance/widgets.h | 29 |
7 files changed, 24 insertions, 121 deletions
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index edf2faa929..41eb18b6c2 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from lance.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## lance Binary: @@ -6,14 +7,16 @@ qt_internal_add_manual_test(lance SOURCES - ../../baseline/painting/paintcommands.cpp ../../baseline/painting/paintcommands.h + ../../baseline/shared/paintcommands.cpp ../../baseline/shared/paintcommands.h interactivewidget.cpp interactivewidget.h main.cpp widgets.h + NO_PCH_SOURCES + interactivewidget.cpp # undef QT_NO_FOREACH INCLUDE_DIRECTORIES . - ../../baseline/painting - PUBLIC_LIBRARIES + ../../baseline/shared + LIBRARIES Qt::CorePrivate Qt::Gui Qt::GuiPrivate @@ -74,14 +77,10 @@ qt_internal_add_resource(lance "images" ${images_resource_files} ) - -#### Keys ignored in scope 1:.:.:lance.pro:<TRUE>: -# TEMPLATE = "app" - ## Scopes: ##################################################################### qt_internal_extend_target(lance CONDITION TARGET Qt::OpenGL - PUBLIC_LIBRARIES + LIBRARIES Qt::OpenGL ) diff --git a/tests/manual/lance/README b/tests/manual/lance/README index 6e89b29b08..68a9d647bc 100644 --- a/tests/manual/lance/README +++ b/tests/manual/lance/README @@ -1,6 +1,6 @@ The "lance" tool can be used to edit and run QPainter script (.qps) files. They are used in the "lancelot" qpainter regression autotest. -A collection of scripts can be found in the directory -tests/auto/lancelot/scripts +A collection of scripts can be found in subdirectories under +tests/baseline See lance -help for options. diff --git a/tests/manual/lance/interactivewidget.cpp b/tests/manual/lance/interactivewidget.cpp index 62c3b5586a..03bfca8566 100644 --- a/tests/manual/lance/interactivewidget.cpp +++ b/tests/manual/lance/interactivewidget.cpp @@ -1,30 +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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "interactivewidget.h" #include <QtWidgets> diff --git a/tests/manual/lance/interactivewidget.h b/tests/manual/lance/interactivewidget.h index bd6d54664a..b11c6cfee2 100644 --- a/tests/manual/lance/interactivewidget.h +++ b/tests/manual/lance/interactivewidget.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef INTERACTIVEWIDGET_H #define INTERACTIVEWIDGET_H diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index f6c6210998..68f5368f7d 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -1,4 +1,4 @@ -LANCELOT_DIR = $$PWD/../../baseline/painting +LANCELOT_DIR = $$[QT_HOST_PREFIX]/tests/baseline/shared CONFIG += cmdline moc TEMPLATE = app INCLUDEPATH += . $$LANCELOT_DIR @@ -11,7 +11,7 @@ SOURCES += interactivewidget.cpp \ main.cpp \ $$LANCELOT_DIR/paintcommands.cpp RESOURCES += icons.qrc \ - $$LANCELOT_DIR/images.qrc + $$LANCELOT_DIR/../painting/images.qrc qtHaveModule(opengl): QT += opengl diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp index caf68654b6..f39001f3c2 100644 --- a/tests/manual/lance/main.cpp +++ b/tests/manual/lance/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "interactivewidget.h" #include "widgets.h" #include "paintcommands.h" @@ -216,6 +191,7 @@ int main(int argc, char **argv) DeviceType type = WidgetType; QSurfaceFormat contextFormat; + contextFormat.setStencilBufferSize(8); bool checkers_background = true; QImage::Format imageFormat = QImage::Format_ARGB32_Premultiplied; diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h index a804471f53..ae2e75fbdc 100644 --- a/tests/manual/lance/widgets.h +++ b/tests/manual/lance/widgets.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef WIDGETS_H #define WIDGETS_H |