summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 0460c52d1c..1ae4da12e8 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -147,17 +147,13 @@ QString QCoreApplicationPrivate::macMenuBarName()
#endif
QString QCoreApplicationPrivate::appName() const
{
- static QBasicMutex applicationNameMutex;
- QMutexLocker locker(&applicationNameMutex);
-
- if (applicationName.isNull()) {
+ QString applicationName;
#ifdef Q_OS_MAC
- applicationName = macMenuBarName();
+ applicationName = macMenuBarName();
#endif
- if (applicationName.isEmpty() && argv[0]) {
- char *p = strrchr(argv[0], '/');
- applicationName = QString::fromLocal8Bit(p ? p + 1 : argv[0]);
- }
+ if (applicationName.isEmpty() && argv[0]) {
+ char *p = strrchr(argv[0], '/');
+ applicationName = QString::fromLocal8Bit(p ? p + 1 : argv[0]);
}
return applicationName;