diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-08 11:55:25 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-08 11:55:25 (GMT) |
| commit | 30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch) | |
| tree | 8483a7b767bb36023f90bca39f8512dc11553f22 /tools/designer/src/lib/shared/actionrepository.cpp | |
| parent | d170179f00effe691de23167e02ff5aeecaeb054 (diff) | |
| parent | 2e62227f950aac8205f2b67e4d7d046836b2c799 (diff) | |
| download | Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2 | |
Merge remote branch 'origin/master'
Diffstat (limited to 'tools/designer/src/lib/shared/actionrepository.cpp')
| -rw-r--r-- | tools/designer/src/lib/shared/actionrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp index 1655d07..83e64e6 100644 --- a/tools/designer/src/lib/shared/actionrepository.cpp +++ b/tools/designer/src/lib/shared/actionrepository.cpp @@ -226,7 +226,7 @@ void ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, item->setText(action->text()); item->setToolTip(action->text()); // shortcut - const QString shortcut = actionShortCut(core, action).value().toString(); + const QString shortcut = actionShortCut(core, action).value().toString(QKeySequence::NativeText); item = sl[ShortCutColumn]; item->setText(shortcut); item->setToolTip(shortcut); |