From f7c182fa3d6526b05403b0374f29b30aed9995e0 Mon Sep 17 00:00:00 2001
From: Markku Luukkainen <markku.luukkainen@digia.com>
Date: Wed, 27 May 2009 11:38:55 +0200
Subject: Changed menu adaptation to handle case where no softkeystack is
 instantiated better

---
 src/gui/widgets/qmenu_symbian.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 1ed3505..1577977 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -184,7 +184,7 @@ static void rebuildMenu()
     QMenuBarPrivate *mb = 0;
     QWidget *w = qApp->activeWindow();
     QMainWindow *mainWindow = qobject_cast<QMainWindow*>(w);
-    if (mainWindow) {
+    if ((mainWindow) && mainWindow->hasSoftKeyStack()) {
         QSoftKeyStack* softKeyStack = mainWindow->softKeyStack();
         if (!softKeyStack->isEmpty()) {
             const QSoftkeySet& softKeyTop = softKeyStack->top();
-- 
cgit v0.12