diff options
Diffstat (limited to 'examples/widgets/painting/gradients')
-rw-r--r-- | examples/widgets/painting/gradients/.prev_CMakeLists.txt | 222 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/CMakeLists.txt | 256 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/gradients.cpp | 69 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/gradients.h | 51 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/main.cpp | 56 |
5 files changed, 71 insertions, 583 deletions
diff --git a/examples/widgets/painting/gradients/.prev_CMakeLists.txt b/examples/widgets/painting/gradients/.prev_CMakeLists.txt deleted file mode 100644 index 7e798d032e..0000000000 --- a/examples/widgets/painting/gradients/.prev_CMakeLists.txt +++ /dev/null @@ -1,222 +0,0 @@ -# Generated from gradients.pro. - -cmake_minimum_required(VERSION 3.14) -project(gradients LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/gradients") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) - -qt_add_executable(gradients - ../shared/arthurstyle.cpp ../shared/arthurstyle.h - ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - ../shared/hoverpoints.cpp ../shared/hoverpoints.h - gradients.cpp gradients.h - main.cpp -) -set_target_properties(gradients PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_include_directories(gradients PUBLIC - ../shared -) - -target_link_libraries(gradients PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets -) - - -# Resources: -set_source_files_properties("../shared/images/button_normal_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png" -) -set_source_files_properties("../shared/images/button_normal_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png" -) -set_source_files_properties("../shared/images/button_normal_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png" -) -set_source_files_properties("../shared/images/button_pressed_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png" -) -set_source_files_properties("../shared/images/button_pressed_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png" -) -set_source_files_properties("../shared/images/button_pressed_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png" -) -set_source_files_properties("../shared/images/frame_bottom.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png" -) -set_source_files_properties("../shared/images/frame_bottomleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png" -) -set_source_files_properties("../shared/images/frame_bottomright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png" -) -set_source_files_properties("../shared/images/frame_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png" -) -set_source_files_properties("../shared/images/frame_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png" -) -set_source_files_properties("../shared/images/frame_top.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png" -) -set_source_files_properties("../shared/images/frame_topleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png" -) -set_source_files_properties("../shared/images/frame_topright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_left_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_right_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_top_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_topleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png" -) -set_source_files_properties("../shared/images/groupframe_topright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png" -) -set_source_files_properties("../shared/images/line_dash_dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png" -) -set_source_files_properties("../shared/images/line_dash_dot_dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png" -) -set_source_files_properties("../shared/images/line_dashed.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png" -) -set_source_files_properties("../shared/images/line_dotted.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png" -) -set_source_files_properties("../shared/images/line_solid.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png" -) -set_source_files_properties("../shared/images/radiobutton-on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png" -) -set_source_files_properties("../shared/images/radiobutton_off.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png" -) -set_source_files_properties("../shared/images/radiobutton_on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png" -) -set_source_files_properties("../shared/images/slider_bar.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png" -) -set_source_files_properties("../shared/images/slider_thumb_on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png" -) -set_source_files_properties("../shared/images/title_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png" -) -set_source_files_properties("../shared/images/title_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png" -) -set_source_files_properties("../shared/images/title_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png" -) -set(shared_resource_files - "images/button_normal_cap_left.png" - "images/button_normal_cap_right.png" - "images/button_normal_stretch.png" - "images/button_pressed_cap_left.png" - "images/button_pressed_cap_right.png" - "images/button_pressed_stretch.png" - "images/frame_bottom.png" - "images/frame_bottomleft.png" - "images/frame_bottomright.png" - "images/frame_left.png" - "images/frame_right.png" - "images/frame_top.png" - "images/frame_topleft.png" - "images/frame_topright.png" - "images/groupframe_bottom_left.png" - "images/groupframe_bottom_right.png" - "images/groupframe_bottom_stretch.png" - "images/groupframe_left_stretch.png" - "images/groupframe_right_stretch.png" - "images/groupframe_top_stretch.png" - "images/groupframe_topleft.png" - "images/groupframe_topright.png" - "images/line_dash_dot.png" - "images/line_dash_dot_dot.png" - "images/line_dashed.png" - "images/line_dotted.png" - "images/line_solid.png" - "images/radiobutton-on.png" - "images/radiobutton_off.png" - "images/radiobutton_on.png" - "images/slider_bar.png" - "images/slider_thumb_on.png" - "images/title_cap_left.png" - "images/title_cap_right.png" - "images/title_stretch.png" -) - -qt6_add_resources(gradients "shared" - PREFIX - "/res" - BASE - "../shared" - FILES - ${shared_resource_files} -) -set(gradients_resource_files - "gradients.cpp" - "gradients.html" -) - -qt6_add_resources(gradients "gradients" - PREFIX - "/res/gradients" - FILES - ${gradients_resource_files} -) - -if(QT_FEATURE_opengl) - target_sources(gradients PUBLIC - ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - ) - - target_link_libraries(gradients PUBLIC - Qt::OpenGL - ) -endif() - -install(TARGETS gradients - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index 6ad4dfa771..39cc44ed8f 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -1,201 +1,74 @@ -# Generated from gradients.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(gradients LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/gradients") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +qt_standard_project_setup() qt_add_executable(gradients - # special case begin - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end gradients.cpp gradients.h main.cpp ) + set_target_properties(gradients PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_include_directories(gradients PUBLIC - ../shared -) -# special case begin if(NOT TARGET painting_shared::painting_shared) - add_subdirectory(../shared painting_shared) + include(../shared/use_lib.cmake) endif() -# special case end -target_link_libraries(gradients PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - painting_shared::painting_shared # special case +target_link_libraries(gradients PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets + painting_shared::painting_shared ) - # Resources: -set_source_files_properties("../shared/images/button_normal_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png" -) -set_source_files_properties("../shared/images/button_normal_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png" -) -set_source_files_properties("../shared/images/button_normal_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png" -) -set_source_files_properties("../shared/images/button_pressed_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png" -) -set_source_files_properties("../shared/images/button_pressed_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png" -) -set_source_files_properties("../shared/images/button_pressed_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png" -) -set_source_files_properties("../shared/images/frame_bottom.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png" -) -set_source_files_properties("../shared/images/frame_bottomleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png" -) -set_source_files_properties("../shared/images/frame_bottomright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png" -) -set_source_files_properties("../shared/images/frame_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png" -) -set_source_files_properties("../shared/images/frame_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png" -) -set_source_files_properties("../shared/images/frame_top.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png" -) -set_source_files_properties("../shared/images/frame_topleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png" -) -set_source_files_properties("../shared/images/frame_topright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png" -) -set_source_files_properties("../shared/images/groupframe_bottom_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_left_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_right_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_top_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png" -) -set_source_files_properties("../shared/images/groupframe_topleft.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png" -) -set_source_files_properties("../shared/images/groupframe_topright.png" - PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png" -) -set_source_files_properties("../shared/images/line_dash_dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png" -) -set_source_files_properties("../shared/images/line_dash_dot_dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png" -) -set_source_files_properties("../shared/images/line_dashed.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png" -) -set_source_files_properties("../shared/images/line_dotted.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png" -) -set_source_files_properties("../shared/images/line_solid.png" - PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png" -) -set_source_files_properties("../shared/images/radiobutton-on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png" -) -set_source_files_properties("../shared/images/radiobutton_off.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png" -) -set_source_files_properties("../shared/images/radiobutton_on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png" -) -set_source_files_properties("../shared/images/slider_bar.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png" -) -set_source_files_properties("../shared/images/slider_thumb_on.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png" -) -set_source_files_properties("../shared/images/title_cap_left.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png" -) -set_source_files_properties("../shared/images/title_cap_right.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png" -) -set_source_files_properties("../shared/images/title_stretch.png" - PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png" -) set(shared_resource_files - "images/button_normal_cap_left.png" - "images/button_normal_cap_right.png" - "images/button_normal_stretch.png" - "images/button_pressed_cap_left.png" - "images/button_pressed_cap_right.png" - "images/button_pressed_stretch.png" - "images/frame_bottom.png" - "images/frame_bottomleft.png" - "images/frame_bottomright.png" - "images/frame_left.png" - "images/frame_right.png" - "images/frame_top.png" - "images/frame_topleft.png" - "images/frame_topright.png" - "images/groupframe_bottom_left.png" - "images/groupframe_bottom_right.png" - "images/groupframe_bottom_stretch.png" - "images/groupframe_left_stretch.png" - "images/groupframe_right_stretch.png" - "images/groupframe_top_stretch.png" - "images/groupframe_topleft.png" - "images/groupframe_topright.png" - "images/line_dash_dot.png" - "images/line_dash_dot_dot.png" - "images/line_dashed.png" - "images/line_dotted.png" - "images/line_solid.png" - "images/radiobutton-on.png" - "images/radiobutton_off.png" - "images/radiobutton_on.png" - "images/slider_bar.png" - "images/slider_thumb_on.png" - "images/title_cap_left.png" - "images/title_cap_right.png" - "images/title_stretch.png" -) - -qt6_add_resources(gradients "shared" + "../shared/images/button_normal_cap_left.png" + "../shared/images/button_normal_cap_right.png" + "../shared/images/button_normal_stretch.png" + "../shared/images/button_pressed_cap_left.png" + "../shared/images/button_pressed_cap_right.png" + "../shared/images/button_pressed_stretch.png" + "../shared/images/frame_bottom.png" + "../shared/images/frame_bottomleft.png" + "../shared/images/frame_bottomright.png" + "../shared/images/frame_left.png" + "../shared/images/frame_right.png" + "../shared/images/frame_top.png" + "../shared/images/frame_topleft.png" + "../shared/images/frame_topright.png" + "../shared/images/groupframe_bottom_left.png" + "../shared/images/groupframe_bottom_right.png" + "../shared/images/groupframe_bottom_stretch.png" + "../shared/images/groupframe_left_stretch.png" + "../shared/images/groupframe_right_stretch.png" + "../shared/images/groupframe_top_stretch.png" + "../shared/images/groupframe_topleft.png" + "../shared/images/groupframe_topright.png" + "../shared/images/line_dash_dot.png" + "../shared/images/line_dash_dot_dot.png" + "../shared/images/line_dashed.png" + "../shared/images/line_dotted.png" + "../shared/images/line_solid.png" + "../shared/images/radiobutton-on.png" + "../shared/images/radiobutton_off.png" + "../shared/images/radiobutton_on.png" + "../shared/images/slider_bar.png" + "../shared/images/slider_thumb_on.png" + "../shared/images/title_cap_left.png" + "../shared/images/title_cap_right.png" + "../shared/images/title_stretch.png" +) + +qt_add_resources(gradients "shared" PREFIX "/res" BASE @@ -203,33 +76,28 @@ qt6_add_resources(gradients "shared" FILES ${shared_resource_files} ) + set(gradients_resource_files "gradients.cpp" "gradients.html" ) -qt6_add_resources(gradients "gradients" +qt_add_resources(gradients "gradients" PREFIX "/res/gradients" FILES ${gradients_resource_files} ) -# special case begin -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PUBLIC - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PUBLIC - #Qt::OpenGL - #) -#endif() -# special case end - install(TARGETS gradients - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET gradients + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp index 76d5818d32..5ed3d764d1 100644 --- a/examples/widgets/painting/gradients/gradients.cpp +++ b/examples/widgets/painting/gradients/gradients.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "gradients.h" #include "hoverpoints.h" @@ -105,6 +58,8 @@ uint ShadeWidget::colorAt(int x) for (int i = 1; i < pts.size(); ++i) { if (pts.at(i - 1).x() <= x && pts.at(i).x() >= x) { QLineF l(pts.at(i - 1), pts.at(i)); + if (qIsNull(l.dx())) + continue; l.setLength(l.length() * ((x - l.x1()) / l.dx())); return m_shade.pixel(qRound(qMin(l.x2(), (qreal(m_shade.width() - 1)))), qRound(qMin(l.y2(), qreal(m_shade.height() - 1)))); @@ -318,12 +273,6 @@ GradientWidget::GradientWidget(QWidget *parent) QPushButton *showSourceButton = new QPushButton(mainGroup); showSourceButton->setText(tr("Show Source")); -#if QT_CONFIG(opengl) - QPushButton *enableOpenGLButton = new QPushButton(mainGroup); - enableOpenGLButton->setText(tr("Use OpenGL")); - enableOpenGLButton->setCheckable(true); - enableOpenGLButton->setChecked(m_renderer->usesOpenGL()); -#endif QPushButton *whatsThisButton = new QPushButton(mainGroup); whatsThisButton->setText(tr("What's This?")); whatsThisButton->setCheckable(true); @@ -337,9 +286,6 @@ GradientWidget::GradientWidget(QWidget *parent) mainGroupLayout->addWidget(defaultsGroup); mainGroupLayout->addStretch(1); mainGroupLayout->addWidget(showSourceButton); -#if QT_CONFIG(opengl) - mainGroupLayout->addWidget(enableOpenGLButton); -#endif mainGroupLayout->addWidget(whatsThisButton); QVBoxLayout *editorGroupLayout = new QVBoxLayout(editorGroup); @@ -415,11 +361,6 @@ GradientWidget::GradientWidget(QWidget *parent) connect(showSourceButton, &QPushButton::clicked, m_renderer, &GradientRenderer::showSource); -#if QT_CONFIG(opengl) - connect(enableOpenGLButton, QOverload<bool>::of(&QPushButton::clicked), - m_renderer, &ArthurFrame::enableOpenGL); -#endif - connect(whatsThisButton, QOverload<bool>::of(&QPushButton::clicked), m_renderer, &ArthurFrame::setDescriptionEnabled); connect(whatsThisButton, QOverload<bool>::of(&QPushButton::clicked), @@ -579,7 +520,7 @@ void GradientRenderer::paint(QPainter *p) g = QConicalGradient(pts.at(0), angle); } - for (const auto &stop : qAsConst(m_stops)) + for (const auto &stop : std::as_const(m_stops)) g.setColorAt(stop.first, stop.second); g.setSpread(m_spread); diff --git a/examples/widgets/painting/gradients/gradients.h b/examples/widgets/painting/gradients/gradients.h index 45ef5d0f93..227424b7b4 100644 --- a/examples/widgets/painting/gradients/gradients.h +++ b/examples/widgets/painting/gradients/gradients.h @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #ifndef GRADIENTS_H #define GRADIENTS_H diff --git a/examples/widgets/painting/gradients/main.cpp b/examples/widgets/painting/gradients/main.cpp index 7ffb0326e9..c1e2297512 100644 --- a/examples/widgets/painting/gradients/main.cpp +++ b/examples/widgets/painting/gradients/main.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "gradients.h" @@ -54,11 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(gradients); -#ifdef Q_OS_ANDROID - qputenv("QT_SCALE_FACTOR", "2"); -#endif - QApplication app(argc, argv); GradientWidget gradientWidget; |