diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-26 13:20:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 17:02:25 +0200 |
| commit | 696060134d10d44175970ffd38618544ecdd9387 (patch) | |
| tree | 6d4af2421affd9172ec74dd73b0feb3314ba6d0e /src | |
| parent | 9bd350d03d3c702a4b767e9ebd8c487013e4c315 (diff) | |
Make QCoreApplicationPrivate::appName() thread-safe
Change-Id: Iea0d208e3e4721fff8a6667e0df1203a887c29d3
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |