3 files changed, 17 insertions, 54 deletions
diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt
index 340c455302..39cc44ed8f 100644
--- a/examples/widgets/painting/gradients/CMakeLists.txt
+++ b/examples/widgets/painting/gradients/CMakeLists.txt
@@ -4,21 +4,11 @@
 cmake_minimum_required(VERSION 3.16)
 project(gradients LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/gradients")
-
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
+qt_standard_project_setup()
+
 qt_add_executable(gradients
-    # remove files from ../shared
-    #../shared/arthurstyle.cpp ../shared/arthurstyle.h
-    #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
-    #../shared/hoverpoints.cpp ../shared/hoverpoints.h
     gradients.cpp gradients.h
     main.cpp
 )
@@ -28,18 +18,14 @@ set_target_properties(gradients PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_include_directories(gradients PUBLIC
-    ../shared
-)
-
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
 
-target_link_libraries(gradients PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
+target_link_libraries(gradients PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
     painting_shared::painting_shared
 )
 
@@ -103,19 +89,15 @@ qt_add_resources(gradients "gradients"
         ${gradients_resource_files}
 )
 
-# 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()
-
 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 dcedd250cf..5ed3d764d1 100644
--- a/examples/widgets/painting/gradients/gradients.cpp
+++ b/examples/widgets/painting/gradients/gradients.cpp
@@ -273,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);
@@ -292,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);
@@ -370,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),
@@ -534,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/main.cpp b/examples/widgets/painting/gradients/main.cpp
index 7e61687f91..c1e2297512 100644
--- a/examples/widgets/painting/gradients/main.cpp
+++ b/examples/widgets/painting/gradients/main.cpp
@@ -7,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;