summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:51:14 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:51:14 -0600
commit79751823a7e899821a14fd08c673ca0655ca4b51 (patch)
treeeff23661b954ce94b6cc9bfb63fd99873ec77df9 /src/kernel/qapplication.cpp
parent577ad042c85beec9b04041e4565eac34db57abb0 (diff)
parentd10d2321a34ab6c157bdf2a2e900c0ee52f1bd79 (diff)
downloadqt3-79751823a7e899821a14fd08c673ca0655ca4b51.tar.gz
qt3-79751823a7e899821a14fd08c673ca0655ca4b51.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qapplication.cpp')
-rw-r--r--src/kernel/qapplication.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 5b43301..591fc8d 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -2931,7 +2931,14 @@ int QApplication::exec()
*/
void QApplication::exit( int retcode )
{
- qApp->eventLoop()->exit( retcode );
+ QThread* thread = qApp->guiThread();
+ if (thread) {
+ if (thread->d) {
+ if (thread->d->eventLoop) {
+ thread->d->eventLoop->exit( retcode );
+ }
+ }
+ }
}
/*!