summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-11-25 09:22:08 (GMT)
committerPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-11-25 09:22:08 (GMT)
commit994ef8017dee7a03856afac7d2067acef8529d55 (patch)
treede6d04d8ab589740287edafcb207b0a331c22b28 /src/gui
parent9a74fb08fbfc1157210ac23a6b168022be8cdfd7 (diff)
parentfea7c172500811c7ab69f25b8d317890712cf5e8 (diff)
downloadQt-994ef8017dee7a03856afac7d2067acef8529d55.zip
Qt-994ef8017dee7a03856afac7d2067acef8529d55.tar.gz
Qt-994ef8017dee7a03856afac7d2067acef8529d55.tar.bz2
Merge remote-tracking branch 'flex/master'
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp3
1 files changed, 0 insertions, 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;