diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-14 23:00:17 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-14 23:00:17 (GMT) |
| commit | 4a56fbd816dd4d1ec7643735e549bb39c4ace4c6 (patch) | |
| tree | d793e257bec741e0eda16384c2e548405498e6ef /src/gui/kernel/qapplication.cpp | |
| parent | 542fe69cdeff81acb8f986ff4606043613345dc2 (diff) | |
| parent | 1d0ddf8037c068ff584dda60cffeb6b2b506d4b2 (diff) | |
| download | Qt-4a56fbd816dd4d1ec7643735e549bb39c4ace4c6.zip Qt-4a56fbd816dd4d1ec7643735e549bb39c4ace4c6.tar.gz Qt-4a56fbd816dd4d1ec7643735e549bb39c4ace4c6.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -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; |