From 0bd53651d46955555f2b2ca76685f93a393b7a6c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Apr 2020 10:56:19 -0700 Subject: [PATCH] Fix compatibility with Qt 6 QMutex's non-recursive QMutex in Qt 6 cannot be recursive. So don't call the constructor to pass the option that isn't needed. Change-Id: I9709abb1c3734e10a7defffd1607e76745b5cf0a Reviewed-by: hjk Reviewed-by: Orgad Shaneh --- src/plugins/debugger/uvsc/uvscclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/uvsc/uvscclient.cpp b/src/plugins/debugger/uvsc/uvscclient.cpp index 57de522689a..33889646ed6 100644 --- a/src/plugins/debugger/uvsc/uvscclient.cpp +++ b/src/plugins/debugger/uvsc/uvscclient.cpp @@ -61,7 +61,7 @@ public: Q_GLOBAL_STATIC(QLibrary, gUvscLibrary) Q_GLOBAL_STATIC(QVector, gUvscClients) -static QMutex gUvscsGuard(QMutex::NonRecursive); +static QMutex gUvscsGuard; static QStringList childrenINamesOf(const QString &parentIName, const QStringList &allINames) {