diff options
Diffstat (limited to 'examples/network/secureudpclient')
-rw-r--r-- | examples/network/secureudpclient/CMakeLists.txt | 37 | ||||
-rw-r--r-- | examples/network/secureudpclient/addressdialog.h | 6 | ||||
-rw-r--r-- | examples/network/secureudpclient/association.cpp | 4 | ||||
-rw-r--r-- | examples/network/secureudpclient/association.h | 4 | ||||
-rw-r--r-- | examples/network/secureudpclient/main.cpp | 2 | ||||
-rw-r--r-- | examples/network/secureudpclient/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/network/secureudpclient/mainwindow.h | 8 |
7 files changed, 22 insertions, 41 deletions
diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 3f71a62b7b..53a8c1340e 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/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(secureudpclient 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/secureudpclient") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Widgets) +qt_standard_project_setup() + qt_add_executable(secureudpclient addressdialog.cpp addressdialog.h addressdialog.ui association.cpp association.h @@ -24,15 +20,22 @@ set_target_properties(secureudpclient PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(secureudpclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets +target_link_libraries(secureudpclient PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS secureudpclient - 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 secureudpclient + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/network/secureudpclient/addressdialog.h b/examples/network/secureudpclient/addressdialog.h index aab387cf19..4081f44709 100644 --- a/examples/network/secureudpclient/addressdialog.h +++ b/examples/network/secureudpclient/addressdialog.h @@ -6,17 +6,11 @@ #include <QDialog> QT_BEGIN_NAMESPACE - namespace Ui { - class AddressDialog; - } - QT_END_NAMESPACE -QT_USE_NAMESPACE - class AddressDialog : public QDialog { Q_OBJECT diff --git a/examples/network/secureudpclient/association.cpp b/examples/network/secureudpclient/association.cpp index b76a6a7155..ede8393913 100644 --- a/examples/network/secureudpclient/association.cpp +++ b/examples/network/secureudpclient/association.cpp @@ -3,8 +3,6 @@ #include "association.h" -QT_BEGIN_NAMESPACE - DtlsAssociation::DtlsAssociation(const QHostAddress &address, quint16 port, const QString &connectionName) : name(connectionName), @@ -151,5 +149,3 @@ void DtlsAssociation::pingTimeout() ++ping; } //! [10] - -QT_END_NAMESPACE diff --git a/examples/network/secureudpclient/association.h b/examples/network/secureudpclient/association.h index 8bb7bbc011..4822d7c0c9 100644 --- a/examples/network/secureudpclient/association.h +++ b/examples/network/secureudpclient/association.h @@ -6,8 +6,6 @@ #include <QtNetwork> #include <QtCore> -QT_BEGIN_NAMESPACE - //! [0] class DtlsAssociation : public QObject { @@ -45,6 +43,4 @@ private: }; //! [0] -QT_END_NAMESPACE - #endif // ASSOCIATION_H diff --git a/examples/network/secureudpclient/main.cpp b/examples/network/secureudpclient/main.cpp index 827778769d..d0499728c8 100644 --- a/examples/network/secureudpclient/main.cpp +++ b/examples/network/secureudpclient/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - QT_USE_NAMESPACE - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/network/secureudpclient/mainwindow.cpp b/examples/network/secureudpclient/mainwindow.cpp index 8b9ac24c62..987eb739b9 100644 --- a/examples/network/secureudpclient/mainwindow.cpp +++ b/examples/network/secureudpclient/mainwindow.cpp @@ -83,7 +83,7 @@ void MainWindow::on_connectButton_clicked() return startNewConnection(remoteAddress); addInfoMessage(tr("Looking up the host ...")); - lookupId = QHostInfo::lookupHost(hostName, this, SLOT(lookupFinished(QHostInfo))); + lookupId = QHostInfo::lookupHost(hostName, this, &MainWindow::lookupFinished); updateUi(); } diff --git a/examples/network/secureudpclient/mainwindow.h b/examples/network/secureudpclient/mainwindow.h index 4e55d0f156..8b68f5787e 100644 --- a/examples/network/secureudpclient/mainwindow.h +++ b/examples/network/secureudpclient/mainwindow.h @@ -8,21 +8,15 @@ #include <QList> QT_BEGIN_NAMESPACE - namespace Ui { - class MainWindow; - } class QHostAddress; class QHostInfo; - -class DtlsAssociation; - QT_END_NAMESPACE -QT_USE_NAMESPACE +class DtlsAssociation; class MainWindow : public QMainWindow { |