diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-09-26 10:21:44 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-09-26 12:45:22 +0200 |
| commit | 4e4050fdbdeab6e63c0b55947512a92845872930 (patch) | |
| tree | a4812f62667ba7737f922ba77c51a22bd4354574 | |
| parent | b83a7de714b3c4df0ed5465294102160a2639f24 (diff) | |
Update usage for encrypted connectionv5.14.0-beta2v5.14.0-beta1
Use the QMqttClient::connectToHostEncrypted() version taking a
QSslConfiguration instead of applying global settings.
Furthermore, the deprecated version will be removed in Qt6.
Change-Id: I4b2a9ff2616ed1c0c645d0081719f2d40c6e3b20
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | examples/mqtt/consolepubsub/configuration.h | 6 | ||||
| -rw-r--r-- | examples/mqtt/consolepubsub/main_pub.cpp | 2 | ||||
| -rw-r--r-- | examples/mqtt/consolepubsub/main_sub.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/examples/mqtt/consolepubsub/configuration.h b/examples/mqtt/consolepubsub/configuration.h index b25920f..98392e3 100644 --- a/examples/mqtt/consolepubsub/configuration.h +++ b/examples/mqtt/consolepubsub/configuration.h @@ -57,6 +57,7 @@ #include <QLoggingCategory> #include <QString> #include <QMqttClient> +#include <QSslConfiguration> #include <QSslSocket> struct Configuration @@ -66,6 +67,9 @@ struct Configuration quint8 qos; bool retain{false}; bool useEncryption{false}; +#ifndef QT_NO_SSL + QSslConfiguration sslConfiguration; +#endif }; QMqttClient *createClientWithConfiguration(QCoreApplication *app, @@ -235,7 +239,7 @@ QMqttClient *createClientWithConfiguration(QCoreApplication *app, return nullptr; } - QSslSocket::addDefaultCaCertificates(defaultCerts); + msg->sslConfiguration.setCaCertificates(defaultCerts); msg->useEncryption = true; #endif } diff --git a/examples/mqtt/consolepubsub/main_pub.cpp b/examples/mqtt/consolepubsub/main_pub.cpp index b47fb8e..dafeb73 100644 --- a/examples/mqtt/consolepubsub/main_pub.cpp +++ b/examples/mqtt/consolepubsub/main_pub.cpp @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) #ifndef QT_NO_SSL if (description.useEncryption) - client->connectToHostEncrypted(); + client->connectToHostEncrypted(description.sslConfiguration); else #endif client->connectToHost(); diff --git a/examples/mqtt/consolepubsub/main_sub.cpp b/examples/mqtt/consolepubsub/main_sub.cpp index 9e94037..44a69cf 100644 --- a/examples/mqtt/consolepubsub/main_sub.cpp +++ b/examples/mqtt/consolepubsub/main_sub.cpp @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) #ifndef QT_NO_SSL if (description.useEncryption) - client->connectToHostEncrypted(); + client->connectToHostEncrypted(description.sslConfiguration); else #endif client->connectToHost(); |