2 files changed, 68 insertions, 42 deletions

diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt
index f09dd791ae..82b9ef3928 100644
--- a/examples/widgets/widgets/analogclock/CMakeLists.txt
+++ b/examples/widgets/widgets/analogclock/CMakeLists.txt
@@ -1,16 +1,13 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(analogclock LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/widgets/analogclock")
-
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
+qt_standard_project_setup()
+
 qt_add_executable(analogclock
     analogclock.cpp analogclock.h
     main.cpp
@@ -21,14 +18,21 @@ set_target_properties(analogclock PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(analogclock PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
+target_link_libraries(analogclock PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
 )
 
 install(TARGETS analogclock
-    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 analogclock
+    OUTPUT_SCRIPT deploy_script
+    NO_UNSUPPORTED_PLATFORM_ERROR
 )
+install(SCRIPT ${deploy_script})
diff --git a/examples/widgets/widgets/analogclock/analogclock.cpp b/examples/widgets/widgets/analogclock/analogclock.cpp
index 34d135ed4a..feb7f4e8b5 100644
--- a/examples/widgets/widgets/analogclock/analogclock.cpp
+++ b/examples/widgets/widgets/analogclock/analogclock.cpp
@@ -31,22 +31,31 @@ AnalogClock::AnalogClock(QWidget *parent)
 void AnalogClock::paintEvent(QPaintEvent *)
 //! [8] //! [10]
 {
-    static const QPoint hourHand[3] = {
-        QPoint(7, 8),
-        QPoint(-7, 8),
-        QPoint(0, -40)
+    static const QPoint hourHand[4] = {
+        QPoint(5, 14),
+        QPoint(-5, 14),
+        QPoint(-4, -71),
+        QPoint(4, -71)
     };
-    static const QPoint minuteHand[3] = {
-        QPoint(7, 8),
-        QPoint(-7, 8),
-        QPoint(0, -70)
+    static const QPoint minuteHand[4] = {
+        QPoint(4, 14),
+        QPoint(-4, 14),
+        QPoint(-3, -89),
+        QPoint(3, -89)
     };
 
-    QColor hourColor(127, 0, 127);
-    QColor minuteColor(0, 127, 127, 191);
+    static const QPoint secondsHand[4] = {
+       QPoint(1, 14),
+       QPoint(-1, 14),
+       QPoint(-1, -89),
+       QPoint(1, -89)
+    };
+
+    const QColor hourColor(palette().color(QPalette::Text));
+    const QColor minuteColor(palette().color(QPalette::Text));
+    const QColor secondsColor(palette().color(QPalette::Accent));
 
     int side = qMin(width(), height());
-    QTime time = QTime::currentTime();
 //! [10]
 
 //! [11]
@@ -55,45 +64,58 @@ void AnalogClock::paintEvent(QPaintEvent *)
     painter.setRenderHint(QPainter::Antialiasing);
 //! [12] //! [13]
     painter.translate(width() / 2, height() / 2);
-//! [13] //! [14]
     painter.scale(side / 200.0, side / 200.0);
-//! [9] //! [14]
+//! [9] //! [13]
+
+//! [14]
+    QTime time = QTime::currentTime();
+//! [14]
 
 //! [15]
     painter.setPen(Qt::NoPen);
 //! [15] //! [16]
     painter.setBrush(hourColor);
 //! [16]
+//! [18]
 
-//! [17] //! [18]
+//! [17]
     painter.save();
 //! [17] //! [19]
     painter.rotate(30.0 * ((time.hour() + time.minute() / 60.0)));
-    painter.drawConvexPolygon(hourHand, 3);
+    painter.drawConvexPolygon(hourHand, 4);
     painter.restore();
 //! [18] //! [19]
 
 //! [20]
-    painter.setPen(hourColor);
-//! [20] //! [21]
-
     for (int i = 0; i < 12; ++i) {
-        painter.drawLine(88, 0, 96, 0);
+        painter.drawRect(73, -3, 16, 6);
         painter.rotate(30.0);
     }
+//! [20]
+
 //! [21]
+    painter.setBrush(minuteColor);
 
 //! [22]
-    painter.setPen(Qt::NoPen);
-//! [22] //! [23]
-    painter.setBrush(minuteColor);
+    painter.save();
+    painter.rotate(6.0 * time.minute());
+    painter.drawConvexPolygon(minuteHand, 4);
+    painter.restore();
+//! [21] //! [22]
+
+
+//! [23]
+    painter.setBrush(secondsColor);
+//! [23]
 
 //! [24]
     painter.save();
-    painter.rotate(6.0 * (time.minute() + time.second() / 60.0));
-    painter.drawConvexPolygon(minuteHand, 3);
+    painter.rotate(6.0 * time.second());
+    painter.drawConvexPolygon(secondsHand, 4);
+    painter.drawEllipse(-3, -3, 6, 6);
+    painter.drawEllipse(-5, -68, 10, 10);
     painter.restore();
-//! [23] //! [24]
+//! [24]
 
 //! [25]
     painter.setPen(minuteColor);
@@ -101,10 +123,10 @@ void AnalogClock::paintEvent(QPaintEvent *)
 
 //! [27]
     for (int j = 0; j < 60; ++j) {
-        if ((j % 5) != 0)
-            painter.drawLine(92, 0, 96, 0);
+        painter.drawLine(92, 0, 96, 0);
         painter.rotate(6.0);
     }
 //! [27]
+
 }
 //! [26]