summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-10-26 16:09:49 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-10-28 07:48:24 +0100
commitcf03874dbbaeefbc01a2ffcc73dd36bad2442bc6 (patch)
treee195f9d093d42922a90d1a25e6dbe3c98af5769c
parent205629bb6240a4aae52aa62f6f6c9c302148efd2 (diff)
qsslsocket_schannel: update QMutexLocker usage
Following 77d812683f0ad595606f9833613dd49bb2fda26d QMutexLocker is now a templated class which should in most cases be deduced automatically. Doesn't work here because of the global static wrapper. Change-Id: I62fda0651eac12f3234396cb7e41a26df8cc8b46 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--src/network/ssl/qsslsocket_schannel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp
index 0722d380d0..1e59550c59 100644
--- a/src/network/ssl/qsslsocket_schannel.cpp
+++ b/src/network/ssl/qsslsocket_schannel.cpp
@@ -515,7 +515,7 @@ Q_GLOBAL_STATIC(QRecursiveMutex, qt_schannel_mutex)
void QSslSocketPrivate::ensureInitialized()
{
- const QMutexLocker locker(qt_schannel_mutex);
+ const QMutexLocker<QRecursiveMutex> locker(qt_schannel_mutex);
if (s_loadedCiphersAndCerts)
return;
s_loadedCiphersAndCerts = true;