diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:04:43 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:04:43 +0200 |
| commit | 1c49012bd46ceed7a718191d3e3adf53a3e50cef (patch) | |
| tree | daa5ea9c9b3e9a423221b4ae475c5f7d5c5add06 | |
| parent | 771e4c9b54c372548b94826d6e2156caa6303ece (diff) | |
| parent | 4e4050fdbdeab6e63c0b55947512a92845872930 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I7cad0d6283cbf8fab69105b6e8a61bca9199c5d7
| -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(); |