summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-27 01:00:44 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-27 01:00:45 +0100
commitc6fc2bc3e205e3710d1f9bdca984c3309cc2eb06 (patch)
tree98dff745ee072895b1d3171ef439a9533689a517 /src/network/ssl
parentac7f46dd9114051756f56571b9cb3bda002314a1 (diff)
parentbc107d81004a5f3929f30088f4a58a221bea5c3b (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslsocket_schannel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp
index e75f81bd36..1314b432a4 100644
--- a/src/network/ssl/qsslsocket_schannel.cpp
+++ b/src/network/ssl/qsslsocket_schannel.cpp
@@ -615,8 +615,8 @@ bool QSslSocketBackendPrivate::acquireCredentialsHandle()
nullptr);
if (!chainContext) {
const QString message = isClient
- ? QSslSocket::tr("The certificate provided can not be used for a client.")
- : QSslSocket::tr("The certificate provided can not be used for a server.");
+ ? QSslSocket::tr("The certificate provided cannot be used for a client.")
+ : QSslSocket::tr("The certificate provided cannot be used for a server.");
setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, message);
return false;
}