diff options
Diffstat (limited to 'tests/manual/lance')
-rw-r--r-- | tests/manual/lance/CMakeLists.txt | 165 | ||||
-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 | 31 | ||||
-rw-r--r-- | tests/manual/lance/lance.pro | 4 | ||||
-rw-r--r-- | tests/manual/lance/main.cpp | 32 | ||||
-rw-r--r-- | tests/manual/lance/widgets.h | 41 |
7 files changed, 62 insertions, 247 deletions
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index 568aeaa6e7..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 - ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/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 . - ../../auto/other/lancelot - PUBLIC_LIBRARIES + ../../baseline/shared + LIBRARIES Qt::CorePrivate Qt::Gui Qt::GuiPrivate @@ -34,142 +37,50 @@ qt_internal_add_resource(lance "icons" FILES ${icons_resource_files} ) -set_source_files_properties("../../auto/other/lancelot/images/alpha.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png" -) -set_source_files_properties("../../auto/other/lancelot/images/alpha2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png" -) -set_source_files_properties("../../auto/other/lancelot/images/bitmap.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png" -) -set_source_files_properties("../../auto/other/lancelot/images/border.png" - PROPERTIES QT_RESOURCE_ALIAS "images/border.png" -) -set_source_files_properties("../../auto/other/lancelot/images/borderimage.png" - PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_argb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_indexed.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_indexed_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono_128.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono_palette.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_rgb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dot.png" -) -set_source_files_properties("../../auto/other/lancelot/images/face.png" - PROPERTIES QT_RESOURCE_ALIAS "images/face.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam030.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam045.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam056.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam200.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png" -) -set_source_files_properties("../../auto/other/lancelot/images/image.png" - PROPERTIES QT_RESOURCE_ALIAS "images/image.png" -) -set_source_files_properties("../../auto/other/lancelot/images/mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask.png" -) -set_source_files_properties("../../auto/other/lancelot/images/mask_100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png" -) -set_source_files_properties("../../auto/other/lancelot/images/masked.png" - PROPERTIES QT_RESOURCE_ALIAS "images/masked.png" -) -set_source_files_properties("../../auto/other/lancelot/images/sign.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sign.png" -) -set_source_files_properties("../../auto/other/lancelot/images/solid.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid.png" -) -set_source_files_properties("../../auto/other/lancelot/images/solid2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png" -) -set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg" -) -set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.png" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png" -) -set_source_files_properties("../../auto/other/lancelot/images/zebra.png" - PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png" -) set(images_resource_files - "images/alpha.png" - "images/alpha2x2.png" - "images/bitmap.png" - "images/border.png" - "images/borderimage.png" - "images/dome_argb32.png" - "images/dome_indexed.png" - "images/dome_indexed_mask.png" - "images/dome_mono.png" - "images/dome_mono_128.png" - "images/dome_mono_palette.png" - "images/dome_rgb32.png" - "images/dot.png" - "images/face.png" - "images/gam030.png" - "images/gam045.png" - "images/gam056.png" - "images/gam100.png" - "images/gam200.png" - "images/image.png" - "images/mask.png" - "images/mask_100.png" - "images/masked.png" - "images/sign.png" - "images/solid.png" - "images/solid2x2.png" - "images/struct-image-01.jpg" - "images/struct-image-01.png" - "images/zebra.png" + "../../baseline/painting/images/alpha.png" + "../../baseline/painting/images/alpha2x2.png" + "../../baseline/painting/images/bitmap.png" + "../../baseline/painting/images/border.png" + "../../baseline/painting/images/borderimage.png" + "../../baseline/painting/images/dome_argb32.png" + "../../baseline/painting/images/dome_indexed.png" + "../../baseline/painting/images/dome_indexed_mask.png" + "../../baseline/painting/images/dome_mono.png" + "../../baseline/painting/images/dome_mono_128.png" + "../../baseline/painting/images/dome_mono_palette.png" + "../../baseline/painting/images/dome_rgb32.png" + "../../baseline/painting/images/dot.png" + "../../baseline/painting/images/face.png" + "../../baseline/painting/images/gam030.png" + "../../baseline/painting/images/gam045.png" + "../../baseline/painting/images/gam056.png" + "../../baseline/painting/images/gam100.png" + "../../baseline/painting/images/gam200.png" + "../../baseline/painting/images/image.png" + "../../baseline/painting/images/mask.png" + "../../baseline/painting/images/mask_100.png" + "../../baseline/painting/images/masked.png" + "../../baseline/painting/images/sign.png" + "../../baseline/painting/images/solid.png" + "../../baseline/painting/images/solid2x2.png" + "../../baseline/painting/images/struct-image-01.jpg" + "../../baseline/painting/images/struct-image-01.png" + "../../baseline/painting/images/zebra.png" ) - qt_internal_add_resource(lance "images" PREFIX "/" BASE - "../../auto/other/lancelot" + "../../baseline/painting" FILES ${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 442f372db7..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 @@ -50,7 +25,7 @@ public slots: void save(); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; protected slots: void cmdSelected(QListWidgetItem *item); diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index 4437cb4539..68f5368f7d 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -1,4 +1,4 @@ -LANCELOT_DIR = $$PWD/../../auto/other/lancelot +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 662fc35ad6..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; @@ -633,7 +609,7 @@ int main(int argc, char **argv) + input.suffix() + QStringLiteral(".pdf"); p.setOutputFormat(QPrinter::PdfFormat); p.setOutputFileName(file); - p.setPageSize(QPrinter::A4); + p.setPageSize(QPageSize(QPageSize::A4)); QPainter pt(&p); pcmd.setPainter(&pt); pcmd.setFilePath(fileinfo.absolutePath()); diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h index d8cc12cab5..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 @@ -131,12 +106,12 @@ public: void setCheckersBackground(bool b) { m_checkersBackground = b; } void setType(DeviceType t) { m_deviceType = t; } - void resizeEvent(QResizeEvent *e) { + void resizeEvent(QResizeEvent *e) override { m_image = QImage(); T::resizeEvent(e); } - void paintEvent(QPaintEvent *) { + void paintEvent(QPaintEvent *) override { switch (m_view_mode) { case RenderView: paintRenderView(); break; case BaselineView: paintBaselineView(); break; @@ -254,7 +229,7 @@ public: } - void mouseMoveEvent(QMouseEvent *e) + void mouseMoveEvent(QMouseEvent *e) override { if (m_currentPoint == -1) return; @@ -263,7 +238,7 @@ public: T::update(); } - void mousePressEvent(QMouseEvent *e) + void mousePressEvent(QMouseEvent *e) override { if (e->button() == Qt::RightButton) { m_showControlPoints = true; @@ -280,7 +255,7 @@ public: T::update(); } - void mouseReleaseEvent(QMouseEvent *e) + void mouseReleaseEvent(QMouseEvent *e) override { if (e->button() == Qt::LeftButton) m_currentPoint = -1; @@ -289,7 +264,7 @@ public: T::update(); } - QSize sizeHint() const { return QSize(800, 800); } + QSize sizeHint() const override { return QSize(800, 800); } QList<QPointF> m_controlPoints; int m_currentPoint; |