diff options
Diffstat (limited to 'examples/remoteobjects/ssl/sslcppclient')
4 files changed, 36 insertions, 49 deletions
diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt index db39fd6..d46747d 100644 --- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt @@ -2,33 +2,26 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) -project(SslCppClient LANGUAGES CXX) +project(sslcppclient LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslcppclient") find_package(Qt6 REQUIRED COMPONENTS Core RemoteObjects) -qt_add_executable(SslCppClient +qt_standard_project_setup() + +qt_add_executable(sslcppclient main.cpp ) -set_target_properties(SslCppClient PROPERTIES +set_target_properties(sslcppclient PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE FALSE ) -target_link_libraries(SslCppClient PUBLIC - # Remove: gui +target_link_libraries(sslcppclient PRIVATE Qt::Core Qt::RemoteObjects - Qt::RemoteObjectsPrivate ) # Resources: @@ -38,11 +31,9 @@ set(cert_resource_files "../sslserver/cert/rootCA.key" "../sslserver/cert/rootCA.pem" "../sslserver/cert/rootCA.srl" - "../sslserver/cert/server.crt" - "../sslserver/cert/server.key" ) -qt6_add_resources(SslCppClient "cert" +qt6_add_resources(sslcppclient "cert" PREFIX "/sslcert" BASE @@ -51,12 +42,6 @@ qt6_add_resources(SslCppClient "cert" ${cert_resource_files} ) -qt6_add_repc_replicas(SslCppClient - timemodel.rep -) - -install(TARGETS SslCppClient - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +qt6_add_repc_replicas(sslcppclient + ../../timemodel.rep ) diff --git a/examples/remoteobjects/ssl/sslcppclient/main.cpp b/examples/remoteobjects/ssl/sslcppclient/main.cpp index 9d49a12..33a3437 100644 --- a/examples/remoteobjects/ssl/sslcppclient/main.cpp +++ b/examples/remoteobjects/ssl/sslcppclient/main.cpp @@ -11,12 +11,13 @@ #include <QRemoteObjectNode> -class tester : public QObject +class Tester : public QObject { Q_OBJECT public: - tester() : QObject(nullptr) + Tester() : QObject(nullptr) { + //! [0] QRemoteObjectNode m_client; auto socket = setupConnection(); connect(socket, &QSslSocket::errorOccurred, @@ -24,35 +25,49 @@ public: qDebug() << "QSslSocket::error" << error; }) ; m_client.addClientSideConnection(socket); + //! [0] + //! [1] ptr1.reset(m_client.acquire< MinuteTimerReplica >()); ptr2.reset(m_client.acquire< MinuteTimerReplica >()); ptr3.reset(m_client.acquire< MinuteTimerReplica >()); - QTimer::singleShot(0, this, &tester::clear); - QTimer::singleShot(1, this, &tester::clear); - QTimer::singleShot(10000, this, &tester::clear); - QTimer::singleShot(11000, this, &tester::clear); + QTimer::singleShot(0, this, &Tester::clear); + QTimer::singleShot(1, this, &Tester::clear); + QTimer::singleShot(10000, this, &Tester::clear); + QTimer::singleShot(11000, this, &Tester::clear); + //! [1] } public slots: + + //! [2] void clear() { static int i = 0; if (i == 0) { i++; + if (ptr1.isNull()) + qCritical() << "Pointer 1 was not set"; ptr1.reset(); } else if (i == 1) { i++; + if (ptr2.isNull()) + qCritical() << "Pointer 2 was not set"; ptr2.reset(); } else if (i == 2) { i++; + if (ptr3.isNull()) + qCritical() << "Pointer 3 was not set"; ptr3.reset(); } else { qApp->quit(); } } + //! [2] private: - QScopedPointer<MinuteTimerReplica> ptr1, ptr2, ptr3; + QScopedPointer<MinuteTimerReplica> ptr1; + QScopedPointer<MinuteTimerReplica> ptr2; + QScopedPointer<MinuteTimerReplica> ptr3; QSslSocket *setupConnection() { @@ -70,6 +85,7 @@ private: } }; +//! [3] int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); @@ -78,8 +94,9 @@ int main(int argc, char *argv[]) config.setCaCertificates(QSslCertificate::fromPath(QStringLiteral(":/sslcert/rootCA.pem"))); QSslConfiguration::setDefaultConfiguration(config); - tester t; + Tester t; return a.exec(); } +//! [3] #include "main.moc" diff --git a/examples/remoteobjects/ssl/sslcppclient/sslcppclient.pro b/examples/remoteobjects/ssl/sslcppclient/sslcppclient.pro index 07fb8da..c616441 100644 --- a/examples/remoteobjects/ssl/sslcppclient/sslcppclient.pro +++ b/examples/remoteobjects/ssl/sslcppclient/sslcppclient.pro @@ -1,21 +1,18 @@ QT_FOR_CONFIG += network requires(qtConfig(ssl)) -REPC_REPLICA += timemodel.rep +REPC_REPLICA += ../../timemodel.rep QT = remoteobjects remoteobjects-private core QT -= gui -TARGET = SslCppClient +TARGET = sslcppclient CONFIG -= app_bundle TEMPLATE = app SOURCES += main.cpp -OTHER_FILES += \ - timemodel.rep - RESOURCES += \ ../sslserver/cert/cert.qrc diff --git a/examples/remoteobjects/ssl/sslcppclient/timemodel.rep b/examples/remoteobjects/ssl/sslcppclient/timemodel.rep deleted file mode 100644 index cbfaf24..0000000 --- a/examples/remoteobjects/ssl/sslcppclient/timemodel.rep +++ /dev/null @@ -1,12 +0,0 @@ -#include <QtCore> - -POD PresetInfo(int presetNumber, float frequency, QString stationName) -class MinuteTimer -{ - PROP(int hour=1); - PROP(int minute=51); - SIGNAL(timeChanged()); - SIGNAL(timeChanged2(QTime t)); - SIGNAL(sendCustom(PresetInfo info)); - SLOT(void SetTimeZone(int zn)); -}; |