summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenu_symbian.cpp
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-27 09:38:55 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-27 09:38:55 (GMT)
commitf7c182fa3d6526b05403b0374f29b30aed9995e0 (patch)
tree5764373a5ca42c2939ff47aa3151dbaa70b4cd45 /src/gui/widgets/qmenu_symbian.cpp
parent5e38702684529cf7c3d1ab8ac6cd14900ca20b89 (diff)
downloadQt-f7c182fa3d6526b05403b0374f29b30aed9995e0.zip
Qt-f7c182fa3d6526b05403b0374f29b30aed9995e0.tar.gz
Qt-f7c182fa3d6526b05403b0374f29b30aed9995e0.tar.bz2
Changed menu adaptation to handle case where no softkeystack
is instantiated better
Diffstat (limited to 'src/gui/widgets/qmenu_symbian.cpp')
-rw-r--r--src/gui/widgets/qmenu_symbian.cpp2
1 files changed, 1 insertions, 1 deletions
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();