From e0cf8cf5f122c9b7ecd5bc532591cdb138c71877 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 22 May 2012 13:56:45 +0200 Subject: 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 --- src/corelib/kernel/qcoreapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3