diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 11:36:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 11:36:10 (GMT) |
| commit | 0cf5055ed325ec98f4affe21e2ef5181cf0fe830 (patch) | |
| tree | d5649e4c1bac7a028bab3e72c8d2cf255d38db65 /src/gui | |
| parent | d1502cb8e3ed43823d63f6e39e24b0a83625291e (diff) | |
| parent | 736b8205158dd7b98af862a029b273dff6fb716d (diff) | |
| download | Qt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.zip Qt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.tar.gz Qt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QApplication: fix crash exit whith native windows
Diffstat (limited to 'src/gui')
| -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; |