From fd7b52d268ab3f9cdcdb06a77b715644d2d22ef3 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 13 Mar 2013 10:34:18 +0100 Subject: Make QCoreApplication::startingUp() return false when appropriate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, QCoreApplication::startingUp() returns true even after a QCoreApplication has been constructed. This patch makes it return false after it has been constructed and adds checks to QApplication and QGuiApplication to ensure that it returns true within the constructor of these classes. Task-number: QTBUG-2591 Change-Id: Ie511522d35b5658c20be43dd112eae18c205277f Reviewed-by: Jędrzej Nowacki Reviewed-by: Friedemann Kleint Reviewed-by: Samuel Rødal --- src/corelib/kernel/qcoreapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index ec808424f9..02d4d0376a 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -638,6 +638,8 @@ void QCoreApplication::init() d->processCommandLineArguments(); qt_startup_hook(); + + QCoreApplicationPrivate::is_app_running = true; // No longer starting up. } /*! -- cgit v1.2.3