From 03903ec7836958a1ddddff31960d5a1ef654b094 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 15 Feb 2017 13:50:46 +0100 Subject: [PATCH] QJNIHelpers: make mutexes static Amends 265db5ad9bda9c984393c1e95fd27dcc4633ed1c. Change-Id: I707bb88285531ee9f82efec46901871d53413eb3 Reviewed-by: BogDan Vatra --- src/corelib/kernel/qjnihelpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 58912aa261..310d3e24b2 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -61,7 +61,7 @@ static jclass g_jNativeClass = Q_NULLPTR; static jmethodID g_runPendingCppRunnablesMethodID = Q_NULLPTR; static jmethodID g_hideSplashScreenMethodID = Q_NULLPTR; Q_GLOBAL_STATIC(std::deque, g_pendingRunnables); -QBasicMutex g_pendingRunnablesMutex; +static QBasicMutex g_pendingRunnablesMutex; class PermissionsResultClass : public QObject { @@ -76,7 +76,7 @@ private: typedef QHash> PendingPermissionRequestsHash; Q_GLOBAL_STATIC(PendingPermissionRequestsHash, g_pendingPermissionRequests); -QBasicMutex g_pendingPermissionRequestsMutex; +static QBasicMutex g_pendingPermissionRequestsMutex; static int nextRequestCode() { static QBasicAtomicInt counter;