diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-11 03:45:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-11 03:45:29 (GMT) |
| commit | 2b527006a3e9147a447a08d78004e20a7ac3d17c (patch) | |
| tree | 1353330a67306f2fdae49468dfdf07c5912baaca /src/gui/kernel | |
| parent | 581df4debb1660ad1879fd59baf79f7fbde260ed (diff) | |
| parent | 86f167ceaf92b386595d62a43bb5d00b4019c989 (diff) | |
| download | Qt-2b527006a3e9147a447a08d78004e20a7ac3d17c.zip Qt-2b527006a3e9147a447a08d78004e20a7ac3d17c.tar.gz Qt-2b527006a3e9147a447a08d78004e20a7ac3d17c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix crash in QRuntimeGraphicsSystem due to destruction order.
Fix crash in OpenVG when failing to allocate large VGImages.
Updated 4.7.0 changelog
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index e99f6ca..d6fb630 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1140,6 +1140,8 @@ QApplication::~QApplication() QApplicationPrivate::app_style = 0; delete QApplicationPrivate::app_icon; QApplicationPrivate::app_icon = 0; + delete QApplicationPrivate::graphics_system; + QApplicationPrivate::graphics_system = 0; #ifndef QT_NO_CURSOR d->cursor_list.clear(); #endif |