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-14 10:47:34 +0100 |
| commit | fd7b52d268ab3f9cdcdb06a77b715644d2d22ef3 (patch) | |
| tree | 239e2768cf7542d571f2275ed9e2bdf42daa9712 /src/corelib/kernel | |
| parent | 1d276c256fa6f6ad8cc2c2debd5e0567fd1eba14 (diff) | |
Make QCoreApplication::startingUp() return false when appropriate.
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 <jedrzej.nowacki@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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. } /*! |