diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2013-03-13 10:34:18 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 19:52:26 +0100 |
commit | 9181ee4d86b29b12d2c87fda0699c10df4b28e43 (patch) | |
tree | 5fc6354c3a190ad493448561b1d6f5ae43afc4b4 /src | |
parent | 37842c2fdb10b8802cae7ebeead7d4e356251053 (diff) |
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 <sergio.ahumada@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 6 |
1 files 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 } /***************************************************************************** |