From 9181ee4d86b29b12d2c87fda0699c10df4b28e43 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 13 Mar 2013 10:34:18 +0100 Subject: [PATCH] Fix missing parts of Ie511522d35b5658c20be43dd112eae18c205277f in merge 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 Reviewed-by: David Faure (KDE) Reviewed-by: Mitch Curtis --- src/widgets/kernel/qapplication.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 6dc8c0b6ba..eda6751082 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -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 } /*****************************************************************************