diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-03-11 10:15:57 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-04-04 10:46:21 +0000 |
| commit | 1a38beab9220dc14bec7e87586d64170b2826668 (patch) | |
| tree | e3cba92a3546914de99a447ab0dcbb4591f417a9 /src | |
| parent | f250ce436ed8c9a838748d09f239164ba55fd0d1 (diff) | |
Update deprecation of QMqttClient::connectToHostEncrypted
Added documentation flag and also mark the function itself as
deprecated.
Change-Id: I4cc84b2c79ee0849d09b91e1778f38da5478b3c0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mqtt/qmqttclient.cpp | 5 | ||||
| -rw-r--r-- | src/mqtt/qmqttclient.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mqtt/qmqttclient.cpp b/src/mqtt/qmqttclient.cpp index e233ae7..11d3af3 100644 --- a/src/mqtt/qmqttclient.cpp +++ b/src/mqtt/qmqttclient.cpp @@ -509,9 +509,14 @@ void QMqttClient::connectToHost() } /*! + \obsolete + Initiates an encrypted connection to the MQTT broker. \a sslPeerName specifies the peer name to be passed to the socket. + + This function has been deprecated. Use + \l QMqttClient::connectToHostEncrypted(const QSslConfiguration &conf) instead. */ #ifndef QT_NO_SSL #if QT_DEPRECATED_SINCE(5, 14) diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index ae21dae..478c7e8 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -131,7 +131,7 @@ public: Q_INVOKABLE void connectToHost(); #ifndef QT_NO_SSL #if QT_DEPRECATED_SINCE(5, 14) - Q_INVOKABLE void connectToHostEncrypted(const QString &sslPeerName = QString()); /// ### Qt 6: remove + QT_DEPRECATED Q_INVOKABLE void connectToHostEncrypted(const QString &sslPeerName = QString()); /// ### Qt 6: remove #endif void connectToHostEncrypted(const QSslConfiguration &conf); #endif |