diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-09-26 10:31:21 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-10-11 07:42:11 +0200 |
| commit | 958e908cce4368e66f22f2220b1ab5831ec7d59a (patch) | |
| tree | fcfaac661cf54e335286a8e1b9760d2dd43059b9 | |
| parent | 8f5b4911b30dc9454bd5396932a2f4d994e10d44 (diff) | |
Qt6: Remove deprecated function
has been superseded by QMqttClient::connectToHostEncrypted(const
QSslConfiguration&).
Change-Id: Ia4660be10a53f69ee310f253603a8530668f6332
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/mqtt/qmqttclient.cpp | 17 | ||||
| -rw-r--r-- | src/mqtt/qmqttclient.h | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/mqtt/qmqttclient.cpp b/src/mqtt/qmqttclient.cpp index a13ce1e..e12bd02 100644 --- a/src/mqtt/qmqttclient.cpp +++ b/src/mqtt/qmqttclient.cpp @@ -532,24 +532,7 @@ void QMqttClient::connectToHost() connectToHost(false, QString()); } -/*! - \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) -void QMqttClient::connectToHostEncrypted(const QString &sslPeerName) -{ - connectToHost(true, sslPeerName); -} -#endif - /*! \since 5.14 Initiates an encrypted connection to the MQTT broker. diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index 2d650a8..c6483a0 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -131,9 +131,6 @@ public: Q_INVOKABLE void connectToHost(); #ifndef QT_NO_SSL -#if QT_DEPRECATED_SINCE(5, 14) - QT_DEPRECATED Q_INVOKABLE void connectToHostEncrypted(const QString &sslPeerName = QString()); /// ### Qt 6: remove -#endif void connectToHostEncrypted(const QSslConfiguration &conf); #endif Q_INVOKABLE void disconnectFromHost(); |