diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-04 00:09:14 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-04 00:09:14 (GMT) |
| commit | 536d0f141a13474122f99daf98bf6b54e635b474 (patch) | |
| tree | 7f0219f0625f20b2678c344f6c5e97dff3bc8a59 /src/gui/widgets/qmenu_symbian.cpp | |
| parent | e0c8fc977738ca4ac6d31e45bdd2aa1b32828f54 (diff) | |
| parent | bec679624c642fb9914c8c43672c249ab0c1ab4c (diff) | |
| download | Qt-536d0f141a13474122f99daf98bf6b54e635b474.zip Qt-536d0f141a13474122f99daf98bf6b54e635b474.tar.gz Qt-536d0f141a13474122f99daf98bf6b54e635b474.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
Diffstat (limited to 'src/gui/widgets/qmenu_symbian.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu_symbian.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp index 4a9cfed..ab2bdea 100644 --- a/src/gui/widgets/qmenu_symbian.cpp +++ b/src/gui/widgets/qmenu_symbian.cpp @@ -149,8 +149,12 @@ static void qt_symbian_insert_action(QSymbianMenuAction* action, QList<SymbianMe "Too many menu actions"); const int underlineShortCut = QApplication::style()->styleHint(QStyle::SH_UnderlineShortcut); - QString iconText = action->action->iconText(); - TPtrC menuItemText = qt_QString2TPtrC( underlineShortCut ? action->action->text() : iconText); + QString actionText; + if (underlineShortCut) + actionText = action->action->text().left(CEikMenuPaneItem::SData::ENominalTextLength); + else + actionText = action->action->iconText().left(CEikMenuPaneItem::SData::ENominalTextLength); + TPtrC menuItemText = qt_QString2TPtrC(actionText); if (action->action->menu()) { SymbianMenuItem* menuItem = new SymbianMenuItem(); menuItem->menuItemData.iCascadeId = action->command; |