diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:02:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:02:09 +0200 |
| commit | bb78c99a01b7fe1f6d01ed6cab836812b85e989d (patch) | |
| tree | 402b8870b4a546d2d78fdc6f6ea9a3c1f2681f55 | |
| parent | f8e3dfedbabbe35e47306766e6fe67be5f401cf0 (diff) | |
| parent | f3b29d9327aef74bcd5668c4a7377513c9b16b11 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4c04a4d8762f2664b3012b6359452f8657697265
| -rw-r--r-- | src/coap/qcoapclient.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/coap/qcoapclient.cpp b/src/coap/qcoapclient.cpp index 999c5ea..367ef5d 100644 --- a/src/coap/qcoapclient.cpp +++ b/src/coap/qcoapclient.cpp @@ -486,8 +486,8 @@ QCoapReply *QCoapClient::observe(const QUrl &url) /*! \overload - Cancels the observation of a resource using the reply returned by the - observe() method. + Cancels the observation of a resource using the reply \a notifiedReply returned by + the observe() method. \sa observe() */ @@ -514,6 +514,11 @@ void QCoapClient::cancelObserve(const QUrl &url) /*! Closes the open sockets and connections to free the transport. + + \note In the secure mode this needs to be called before changing + the security configuration or connecting to another server. + + \sa setSecurityConfiguration() */ void QCoapClient::disconnect() { @@ -601,7 +606,11 @@ bool QCoapClientPrivate::send(QCoapReply *reply) Sets the security configuration parameters from \a configuration. Configuration will be ignored if the QtCoap::NoSecurity mode is used. - \note This method must be called before the handshake starts. + \note This method must be called before the handshake starts. If you need + to change the security configuration after establishing a secure connection + with the server, the client needs to be disconnected first. + + \sa disconnect() */ void QCoapClient::setSecurityConfiguration(const QCoapSecurityConfiguration &configuration) { |