diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-08 12:23:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-14 10:17:14 (GMT) |
| commit | 736b8205158dd7b98af862a029b273dff6fb716d (patch) | |
| tree | bf27f276537a35cfd372b66eff4e1b336daa721f /src/gui/kernel | |
| parent | 72c5658a54bf23f5572f169e604838143db6a352 (diff) | |
| download | Qt-736b8205158dd7b98af862a029b273dff6fb716d.zip Qt-736b8205158dd7b98af862a029b273dff6fb716d.tar.gz Qt-736b8205158dd7b98af862a029b273dff6fb716d.tar.bz2 | |
QApplication: fix crash exit whith native windows
Regression introduced in 8dd8db250d92521fda619bdcf3e1c859b37b2da0
Patch comes from the task
Task-number: QTBUG-15774
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index a4ae46b..b4ff7c4 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1101,6 +1101,9 @@ QApplication::~QApplication() QApplicationPrivate::is_app_closing = true; QApplicationPrivate::is_app_running = false; + delete QWidgetPrivate::mapper; + QWidgetPrivate::mapper = 0; + // delete all widgets if (QWidgetPrivate::allWidgets) { QWidgetSet *mySet = QWidgetPrivate::allWidgets; @@ -1130,9 +1133,6 @@ QApplication::~QApplication() delete d->ignore_cursor; d->ignore_cursor = 0; #endif - delete QWidgetPrivate::mapper; - QWidgetPrivate::mapper = 0; - delete QApplicationPrivate::app_pal; QApplicationPrivate::app_pal = 0; delete QApplicationPrivate::sys_pal; |