diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-21 03:05:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-21 03:05:08 +0100 |
| commit | 1c533de10923c48f27ccbcaf59dcbc4c91538268 (patch) | |
| tree | 0ac08fc8a6556b662eadbc489a0bf8c8216a8eab | |
| parent | 41718adfe8555404be9232968d6b565436ea5ac9 (diff) | |
| parent | 02dbe3346c414d9c606acd5bc799a79a67ad3c1c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I962bcc50c1f78898223b13ef9d9447c5e7a2fea7
| -rw-r--r-- | examples/coap/quicksecureclient/qmlcoapsecureclient.cpp | 7 | ||||
| -rw-r--r-- | src/coap/qcoapqudpconnection.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/coapnetworksettings.h | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/examples/coap/quicksecureclient/qmlcoapsecureclient.cpp b/examples/coap/quicksecureclient/qmlcoapsecureclient.cpp index dd40f4e..3826d93 100644 --- a/examples/coap/quicksecureclient/qmlcoapsecureclient.cpp +++ b/examples/coap/quicksecureclient/qmlcoapsecureclient.cpp @@ -137,13 +137,16 @@ void QmlCoapSecureClient::setSecurityConfiguration(const QString &localCertifica { QCoapSecurityConfiguration configuration; - const auto localCerts = QSslCertificate::fromPath(QUrl(localCertificatePath).toLocalFile()); + const auto localCerts = + QSslCertificate::fromPath(QUrl(localCertificatePath).toLocalFile(), QSsl::Pem, + QSslCertificate::PatternSyntax::FixedString); if (localCerts.isEmpty()) qCWarning(lcCoapClient, "The specified local certificate file is not valid."); else configuration.setLocalCertificateChain(localCerts.toVector()); - const auto caCerts = QSslCertificate::fromPath(QUrl(caCertificatePath).toLocalFile()); + const auto caCerts = QSslCertificate::fromPath(QUrl(caCertificatePath).toLocalFile(), QSsl::Pem, + QSslCertificate::PatternSyntax::FixedString); if (caCerts.isEmpty()) qCWarning(lcCoapClient, "The specified CA certificate file is not valid."); else diff --git a/src/coap/qcoapqudpconnection.cpp b/src/coap/qcoapqudpconnection.cpp index 41224a2..bf2e39d 100644 --- a/src/coap/qcoapqudpconnection.cpp +++ b/src/coap/qcoapqudpconnection.cpp @@ -151,7 +151,7 @@ void QCoapQUdpConnection::createSocket() Q_D(QCoapQUdpConnection); d->socketReadyRead(); }); - connect(d->udpSocket.data(), QOverload<QAbstractSocket::SocketError>::of(&QUdpSocket::error), + connect(d->udpSocket.data(), &QUdpSocket::errorOccurred, [this](QAbstractSocket::SocketError socketError) { qCWarning(lcCoapConnection) << "CoAP UDP socket error" << socketError << socket()->errorString(); diff --git a/tests/auto/coapnetworksettings.h b/tests/auto/coapnetworksettings.h index 7f425ff..2982aa9 100644 --- a/tests/auto/coapnetworksettings.h +++ b/tests/auto/coapnetworksettings.h @@ -130,7 +130,8 @@ QCoapSecurityConfiguration createConfiguration(QtCoap::SecurityMode securityMode } const auto localCertPath = directory + QDir::separator() +"local_cert.pem"; - const auto localCerts = QSslCertificate::fromPath(localCertPath); + const auto localCerts = QSslCertificate::fromPath( + localCertPath, QSsl::Pem, QSslCertificate::PatternSyntax::FixedString); if (localCerts.isEmpty()) { qWarning() << "Failed to load local certificates, the" << localCertPath @@ -140,7 +141,8 @@ QCoapSecurityConfiguration createConfiguration(QtCoap::SecurityMode securityMode } const auto caCertPath = directory + QDir::separator() + "ca_cert.pem"; - const auto caCerts = QSslCertificate::fromPath(caCertPath); + const auto caCerts = QSslCertificate::fromPath(caCertPath, QSsl::Pem, + QSslCertificate::PatternSyntax::FixedString); if (caCerts.isEmpty()) { qWarning() << "Failed to load CA certificates, the" << caCertPath |