summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenu_symbian.cpp
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-27 07:48:33 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-27 07:48:33 (GMT)
commit9d5308b95bed09e72203eb53ced1a57c21744c71 (patch)
tree46f1df7f75dd7b116f39d2b52c2bbd52d6ad44d8 /src/gui/widgets/qmenu_symbian.cpp
parentc6ff9d3052f6ec092395bb9c7a56806f3323c558 (diff)
downloadQt-9d5308b95bed09e72203eb53ced1a57c21744c71.zip
Qt-9d5308b95bed09e72203eb53ced1a57c21744c71.tar.gz
Qt-9d5308b95bed09e72203eb53ced1a57c21744c71.tar.bz2
Added handling for a case when menu is being rebuilt and menu
is not inside a QMainWindow.
Diffstat (limited to 'src/gui/widgets/qmenu_symbian.cpp')
-rw-r--r--src/gui/widgets/qmenu_symbian.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 491c78e..1ed3505 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -184,19 +184,21 @@ static void rebuildMenu()
QMenuBarPrivate *mb = 0;
QWidget *w = qApp->activeWindow();
QMainWindow *mainWindow = qobject_cast<QMainWindow*>(w);
- QSoftKeyStack* softKeyStack = mainWindow->softKeyStack();
- if (!softKeyStack->isEmpty()) {
- const QSoftkeySet& softKeyTop = softKeyStack->top();
- int index=0;
- bool found=false;
- while( index<softKeyTop.count() && !found) {
- QSoftKeyAction* softAction = softKeyTop.at(index);
- QSoftKeyAction::StandardRole role = softAction->role();
- if(softAction->role() == QSoftKeyAction::ContextMenu) {
- widgetWithContextMenu = softAction->parentWidget();
- found=true;
- }
- index++;
+ if (mainWindow) {
+ QSoftKeyStack* softKeyStack = mainWindow->softKeyStack();
+ if (!softKeyStack->isEmpty()) {
+ const QSoftkeySet& softKeyTop = softKeyStack->top();
+ int index=0;
+ bool found=false;
+ while( index<softKeyTop.count() && !found) {
+ QSoftKeyAction* softAction = softKeyTop.at(index);
+ QSoftKeyAction::StandardRole role = softAction->role();
+ if(softAction->role() == QSoftKeyAction::ContextMenu) {
+ widgetWithContextMenu = softAction->parentWidget();
+ found=true;
+ }
+ index++;
+ }
}
}