AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing parts of Ie511522d35b5658c20be43dd112eae18c205277f in merge

Browse Source 
The merge of dev->stable branch somehow lost these bits of:
Make QCoreApplication::startingUp() return false when appropriate.
Which was Change-Id: Ie511522d35b5658c20be43dd112eae18c205277f

Change-Id: I2991b10e2774bf5a59fa37734d4a9fd39d51b472
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
This commit is contained in:
Mitch Curtis 2013-03-13 10:34:18 +01:00 committed by The Qt Project
parent 37842c2fdb
commit 9181ee4d86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/kernel/qapplication.cpp
View File

@ -588,6 +588,8 @@ extern void qRegisterWidgetsVariant();
*/
void QApplicationPrivate::initialize()
{
is_app_running = false; // Starting up.
QWidgetPrivate::mapper = new QWidgetMapper;
QWidgetPrivate::allWidgets = new QWidgetSet;
@ -601,8 +603,6 @@ void QApplicationPrivate::initialize()
qRegisterGuiStateMachine();
#endif
is_app_running = true; // no longer starting up
if (qgetenv("QT_USE_NATIVE_WINDOWS").toInt() > 0)
QCoreApplication::setAttribute(Qt::AA_NativeWindows);
@ -627,6 +627,8 @@ void QApplicationPrivate::initialize()
if (QApplication::desktopSettingsAware())
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
QApplicationPrivate::enabledAnimations = theme->themeHint(QPlatformTheme::UiEffects).toInt();
is_app_running = true; // no longer starting up
}
/*****************************************************************************