diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslerror.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_schannel.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index 74ff6987d2..02dd16a58d 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -326,7 +326,7 @@ QString QSslError::errorString() const errStr = QSslSocket::tr("The client is not authorized to request OCSP status from this server"); break; case OcspResponseCannotBeTrusted: - errStr = QSslSocket::tr("OCSP reponder's identity cannot be verified"); + errStr = QSslSocket::tr("OCSP responder's identity cannot be verified"); break; case OcspResponseCertIdUnknown: errStr = QSslSocket::tr("The identity of a certificate in an OCSP response cannot be established"); diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp index b10bd546c7..965e9bf2f3 100644 --- a/src/network/ssl/qsslsocket_schannel.cpp +++ b/src/network/ssl/qsslsocket_schannel.cpp @@ -617,10 +617,10 @@ bool QSslSocketBackendPrivate::acquireCredentialsHandle() &findParam, nullptr); if (!chainContext) { - setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, - QSslSocket::tr("The certificate provided can not be used for a %1.") - .arg(isClient ? QSslSocket::tr("client") - : QSslSocket::tr("server"))); + 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."); + setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, message); return false; } Q_ASSERT(chainContext->cChain == 1); diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index eb3479b3e0..edaa7854ba 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3695,7 +3695,7 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path) } QDir dir(path2); if (!dir.exists()) - dir = getEnvironmentVariable(path2); + dir.setPath(getEnvironmentVariable(path2)); if (dir.exists() || path2.isEmpty() || path2 == model->myComputer().toString()) { _q_enterDirectory(index); |