3 files changed, 42 insertions, 36 deletions
diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt
index e81065bbfd..abf12d5663 100644
--- a/examples/widgets/widgets/calculator/CMakeLists.txt
+++ b/examples/widgets/widgets/calculator/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(calculator LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/widgets/calculator")
-
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
+qt_standard_project_setup()
+
 qt_add_executable(calculator
     button.cpp button.h
     calculator.cpp calculator.h
@@ -22,14 +19,21 @@ set_target_properties(calculator PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(calculator PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
+target_link_libraries(calculator PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
 )
 
 install(TARGETS calculator
-    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 calculator
+    OUTPUT_SCRIPT deploy_script
+    NO_UNSUPPORTED_PLATFORM_ERROR
 )
+install(SCRIPT ${deploy_script})
diff --git a/examples/widgets/widgets/calculator/calculator.cpp b/examples/widgets/widgets/calculator/calculator.cpp
index 5858d304d2..073b10f985 100644
--- a/examples/widgets/widgets/calculator/calculator.cpp
+++ b/examples/widgets/widgets/calculator/calculator.cpp
@@ -29,29 +29,29 @@ Calculator::Calculator(QWidget *parent)
 
 //! [4]
     for (int i = 0; i < NumDigitButtons; ++i)
-        digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked()));
+        digitButtons[i] = createButton(QString::number(i), &Calculator::digitClicked);
 
-    Button *pointButton = createButton(tr("."), SLOT(pointClicked()));
-    Button *changeSignButton = createButton(tr("\302\261"), SLOT(changeSignClicked()));
+    Button *pointButton = createButton(tr("."), &Calculator::pointClicked);
+    Button *changeSignButton = createButton(tr("\302\261"), &Calculator::changeSignClicked);
 
-    Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked()));
-    Button *clearButton = createButton(tr("Clear"), SLOT(clear()));
-    Button *clearAllButton = createButton(tr("Clear All"), SLOT(clearAll()));
+    Button *backspaceButton = createButton(tr("Backspace"), &Calculator::backspaceClicked);
+    Button *clearButton = createButton(tr("Clear"), &Calculator::clear);
+    Button *clearAllButton = createButton(tr("Clear All"), &Calculator::clearAll);
 
-    Button *clearMemoryButton = createButton(tr("MC"), SLOT(clearMemory()));
-    Button *readMemoryButton = createButton(tr("MR"), SLOT(readMemory()));
-    Button *setMemoryButton = createButton(tr("MS"), SLOT(setMemory()));
-    Button *addToMemoryButton = createButton(tr("M+"), SLOT(addToMemory()));
+    Button *clearMemoryButton = createButton(tr("MC"), &Calculator::clearMemory);
+    Button *readMemoryButton = createButton(tr("MR"), &Calculator::readMemory);
+    Button *setMemoryButton = createButton(tr("MS"), &Calculator::setMemory);
+    Button *addToMemoryButton = createButton(tr("M+"), &Calculator::addToMemory);
 
-    Button *divisionButton = createButton(tr("\303\267"), SLOT(multiplicativeOperatorClicked()));
-    Button *timesButton = createButton(tr("\303\227"), SLOT(multiplicativeOperatorClicked()));
-    Button *minusButton = createButton(tr("-"), SLOT(additiveOperatorClicked()));
-    Button *plusButton = createButton(tr("+"), SLOT(additiveOperatorClicked()));
+    Button *divisionButton = createButton(tr("\303\267"), &Calculator::multiplicativeOperatorClicked);
+    Button *timesButton = createButton(tr("\303\227"), &Calculator::multiplicativeOperatorClicked);
+    Button *minusButton = createButton(tr("-"), &Calculator::additiveOperatorClicked);
+    Button *plusButton = createButton(tr("+"), &Calculator::additiveOperatorClicked);
 
-    Button *squareRootButton = createButton(tr("Sqrt"), SLOT(unaryOperatorClicked()));
-    Button *powerButton = createButton(tr("x\302\262"), SLOT(unaryOperatorClicked()));
-    Button *reciprocalButton = createButton(tr("1/x"), SLOT(unaryOperatorClicked()));
-    Button *equalButton = createButton(tr("="), SLOT(equalClicked()));
+    Button *squareRootButton = createButton(tr("Sqrt"), &Calculator::unaryOperatorClicked);
+    Button *powerButton = createButton(tr("x\302\262"), &Calculator::unaryOperatorClicked);
+    Button *reciprocalButton = createButton(tr("1/x"), &Calculator::unaryOperatorClicked);
+    Button *equalButton = createButton(tr("="), &Calculator::equalClicked);
 //! [4]
 
 //! [5]
@@ -324,10 +324,11 @@ void Calculator::addToMemory()
 }
 //! [32]
 //! [34]
-Button *Calculator::createButton(const QString &text, const char *member)
+template<typename PointerToMemberFunction>
+Button *Calculator::createButton(const QString &text, const PointerToMemberFunction &member)
 {
     Button *button = new Button(text);
-    connect(button, SIGNAL(clicked()), this, member);
+    connect(button, &Button::clicked, this, member);
     return button;
 }
 //! [34]
diff --git a/examples/widgets/widgets/calculator/calculator.h b/examples/widgets/widgets/calculator/calculator.h
index d4fa112909..42e9ac5335 100644
--- a/examples/widgets/widgets/calculator/calculator.h
+++ b/examples/widgets/widgets/calculator/calculator.h
@@ -39,7 +39,8 @@ private slots:
 //! [1]
 private:
 //! [1] //! [2]
-    Button *createButton(const QString &text, const char *member);
+    template<typename PointerToMemberFunction>
+    Button *createButton(const QString &text, const PointerToMemberFunction &member);
     void abortOperation();
     bool calculate(double rightOperand, const QString &pendingOperator);
 //! [2]