From fea7c172500811c7ab69f25b8d317890712cf5e8 Mon Sep 17 00:00:00 2001 From: Jani Hyvonen Date: Tue, 22 Nov 2011 16:26:32 +0200 Subject: Fixing memory leak in QtGui qt_cleanup In qt_cleanup() the S60->setButtonGroupContainer(0) - which sets the QS60Data::cba to zero - is called before calling delete S60->buttonGroupContainer(). Because of this the currently set QS60Data::cba gets never deleted. A call S60->setButtonGroupContainer(0) which sets the QS60Data::cba pointer to zero is now called after calling the delete S60->buttonGroupContainer(). Task-number: QTBUG-22741 Reviewed-by: Murray Read --- src/gui/kernel/qapplication_s60.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index bb84491..ca9c3a3 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2069,9 +2069,6 @@ extern void qt_cleanup_symbianFontDatabase(); // qfontdatabase_s60.cpp *****************************************************************************/ void qt_cleanup() { -#ifdef Q_WS_S60 - S60->setButtonGroupContainer(0); -#endif if(qt_S60Beep) { delete qt_S60Beep; qt_S60Beep = 0; -- cgit v0.12