From 696060134d10d44175970ffd38618544ecdd9387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 26 Sep 2013 13:20:27 +0200 Subject: Make QCoreApplicationPrivate::appName() thread-safe Change-Id: Iea0d208e3e4721fff8a6667e0df1203a887c29d3 Reviewed-by: Olivier Goffart --- src/corelib/kernel/qcoreapplication.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/corelib/kernel/qcoreapplication.cpp') diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 553eaf0820..3ae4e523c8 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -146,6 +146,9 @@ QString QCoreApplicationPrivate::macMenuBarName() #endif QString QCoreApplicationPrivate::appName() const { + static QBasicMutex applicationNameMutex; + QMutexLocker locker(&applicationNameMutex); + if (applicationName.isNull()) { #ifdef Q_OS_MAC applicationName = macMenuBarName(); -- cgit v1.2.3