6 files changed, 21 insertions, 36 deletions
diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt
index aa6f4f69b8..e92186b574 100644
--- a/examples/network/secureudpserver/CMakeLists.txt
+++ b/examples/network/secureudpserver/CMakeLists.txt
@@ -1,17 +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(secureudpserver LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/secureudpserver")
-
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Widgets)
 
+qt_standard_project_setup()
+
 qt_add_executable(secureudpserver
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
@@ -24,15 +20,22 @@ set_target_properties(secureudpserver PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(secureudpserver PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Network
-    Qt::Widgets
+target_link_libraries(secureudpserver PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Network
+    Qt6::Widgets
 )
 
 install(TARGETS secureudpserver
-    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 secureudpserver
+    OUTPUT_SCRIPT deploy_script
+    NO_UNSUPPORTED_PLATFORM_ERROR
 )
+install(SCRIPT ${deploy_script})
diff --git a/examples/network/secureudpserver/main.cpp b/examples/network/secureudpserver/main.cpp
index b144f6571c..7ec6a29aec 100644
--- a/examples/network/secureudpserver/main.cpp
+++ b/examples/network/secureudpserver/main.cpp
@@ -7,8 +7,6 @@
 
 int main(int argc, char *argv[])
 {
-    QT_USE_NAMESPACE
-
     QApplication a(argc, argv);
     MainWindow w;
     w.show();
diff --git a/examples/network/secureudpserver/mainwindow.h b/examples/network/secureudpserver/mainwindow.h
index 77cba00b5e..7c69a9b414 100644
--- a/examples/network/secureudpserver/mainwindow.h
+++ b/examples/network/secureudpserver/mainwindow.h
@@ -8,15 +8,11 @@
 #include <QMainWindow>
 
 QT_BEGIN_NAMESPACE
-
 namespace Ui {
 class MainWindow;
 }
-
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE
-
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
diff --git a/examples/network/secureudpserver/nicselector.h b/examples/network/secureudpserver/nicselector.h
index 1cbe56e85e..4f8bf9a85f 100644
--- a/examples/network/secureudpserver/nicselector.h
+++ b/examples/network/secureudpserver/nicselector.h
@@ -9,15 +9,11 @@
 #include <QList>
 
 QT_BEGIN_NAMESPACE
-
 namespace Ui {
 class NicSelector;
 }
-
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE
-
 class NicSelector : public QDialog
 {
     Q_OBJECT
diff --git a/examples/network/secureudpserver/server.cpp b/examples/network/secureudpserver/server.cpp
index 3f39cbb739..4aa22c606b 100644
--- a/examples/network/secureudpserver/server.cpp
+++ b/examples/network/secureudpserver/server.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 
-QT_BEGIN_NAMESPACE
-
 namespace {
 
 QString peer_info(const QHostAddress &address, quint16 port)
@@ -213,11 +211,9 @@ void DtlsServer::decryptDatagram(QDtls *connection, const QByteArray &clientMess
 //! [14]
 void DtlsServer::shutdown()
 {
-    for (const auto &connection : qExchange(knownClients, {}))
+    for (const auto &connection : std::exchange(knownClients, {}))
         connection->shutdown(&serverSocket);
 
     serverSocket.close();
 }
 //! [14]
-
-QT_END_NAMESPACE
diff --git a/examples/network/secureudpserver/server.h b/examples/network/secureudpserver/server.h
index 05e41d4532..a8b6a727c8 100644
--- a/examples/network/secureudpserver/server.h
+++ b/examples/network/secureudpserver/server.h
@@ -9,8 +9,6 @@
 #include <vector>
 #include <memory>
 
-QT_BEGIN_NAMESPACE
-
 //! [0]
 class DtlsServer : public QObject
 {
@@ -55,6 +53,4 @@ private:
 };
 //! [0]
 
-QT_END_NAMESPACE
-
 #endif // SERVER_H