summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-05-14 16:58:26 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-12 04:30:18 +0200
commitc5665a182db5002afe6dc7c69f343e89de5fca31 (patch)
treeaf488d02a88f3de714629303029c77240d697574 /src/widgets
parentc66dc44968f4ae51e01cee7c7605991177d5e081 (diff)
Only quit if there are no visible widgets or windows.
We need to let the QGuiApplication determine whether quitting is appropriate based on whether there are visible top level QWindows after the last top-level QWidget was closed. This solves the issue raised here: http://thread.gmane.org/gmane.comp.lib.qt.user/1880 The transientParent is the QWindow equivalent of parentWidget on QWidget, so the test in QGuiApplication::shouldQuit is similar to the one in QApplication::shouldQuit. Change-Id: I500eff8d5887f24415180134b3a4be3c630a896f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/kernel/qapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index e9003e8c14..0553dabe51 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -2950,7 +2950,7 @@ bool QApplicationPrivate::shouldQuit()
if (w->isVisible() && !w->parentWidget() && w->testAttribute(Qt::WA_QuitOnClose))
return false;
}
- return true;
+ return QGuiApplicationPrivate::shouldQuit();
}
/*! \reimp