diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-05-29 12:40:31 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-05-29 12:40:31 (GMT) |
| commit | 08be0a099619ab520bb325b5b72f0a428b713766 (patch) | |
| tree | f3143a7b20c73235849fd861eb917e786fa8b867 /src | |
| parent | 22c91975fc34bc2e2a6f5ede1a29d89ec4f3db49 (diff) | |
| parent | 0bd369dd52561d4654697b09a89141e96305e837 (diff) | |
| download | Qt-08be0a099619ab520bb325b5b72f0a428b713766.zip Qt-08be0a099619ab520bb325b5b72f0a428b713766.tar.gz Qt-08be0a099619ab520bb325b5b72f0a428b713766.tar.bz2 | |
Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qsoftkeystack.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/widgets/qsoftkeystack.cpp b/src/gui/widgets/qsoftkeystack.cpp index c68fe19..984922e 100644 --- a/src/gui/widgets/qsoftkeystack.cpp +++ b/src/gui/widgets/qsoftkeystack.cpp @@ -185,15 +185,20 @@ void QSoftKeyStack::handleFocusChanged(QWidget *old, QWidget *now) QMainWindow *mainWindow = qobject_cast<QMainWindow*>(w); if( !mainWindow) return; + if (!mainWindow->hasSoftKeyStack()) + return; QSoftKeyStack* softKeyStack = mainWindow->softKeyStack(); - - Qt::ContextMenuPolicy policy = now->contextMenuPolicy(); - if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) { + if( mainWindow->menuWidget() ) + { QList<QSoftKeyAction*> actionList; QSoftKeyAction* menu = new QSoftKeyAction(QSoftKeyAction::Menu, QString::fromLatin1("Menu"), now); - QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString::fromLatin1("ContextMenu"), now); actionList.append(menu); - actionList.append(contextMenu); + + Qt::ContextMenuPolicy policy = now->contextMenuPolicy(); + if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) { + QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString::fromLatin1("ContextMenu"), now); + actionList.append(contextMenu); + } if (old) softKeyStack->popandPush(actionList); else |