From d5fe82b2ab939727f573429605abd99c039a99d1 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 13 Dec 2010 15:41:16 +0200
Subject: Fix crash when creating more than one QApplication in single test
 case

CBA pointer is stored in static variable and it wasn't cleaned up
properly at QApplication destruction, which led to crash.

Task-number: QTBUG-15915
Reviewed-by: Sami Merila
Reviewed-by: Janne Koskinen
---
 src/gui/kernel/qapplication_s60.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 8596563..81fa4e6 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1633,6 +1633,13 @@ void qt_cleanup()
     //Change mouse pointer back
     S60->wsSession().SetPointerCursorMode(EPointerCursorNone);
 
+#ifdef Q_WS_S60
+    // Clear CBA
+    CEikonEnv::Static()->AppUiFactory()->SwapButtonGroup(0);
+    delete S60->buttonGroupContainer();
+    S60->setButtonGroupContainer(0);
+#endif
+
     if (S60->qtOwnsS60Environment) {
         // Restore the S60 framework trap handler. See qt_init().
         User::SetTrapHandler(S60->s60InstalledTrapHandler);
-- 
cgit v0.12