diff options
| author | David Faure <faure@kde.org> | 2012-05-22 13:56:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 10:13:43 +0200 |
| commit | e0cf8cf5f122c9b7ecd5bc532591cdb138c71877 (patch) | |
| tree | f2a0b99e11c6e9c630679b21e09acb0b4c21bf62 /src | |
| parent | 98dbaecf7f9c16be82b895a75ff02e89ff1f3269 (diff) | |
Fix crash when using QCoreApplication::applicationName in a global static
e.g. when a global-static configuration object uses QTemporaryFile
for saving to disk (via QSaveFile).
Change-Id: I532aec6de7411e10e4461d5a4ac60686e2f482df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index d67c820bb3..53f6b1f57f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1977,7 +1977,7 @@ void QCoreApplication::setApplicationName(const QString &application) QString QCoreApplication::applicationName() { - QString appname = coreappdata()->application; + QString appname = coreappdata() ? coreappdata()->application : QString(); if (appname.isEmpty() && QCoreApplication::self) appname = QCoreApplication::self->d_func()->appName(); return appname; |