diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
commit | a60c9a1ff41e5ca1482121ff3f89a112b359b6d4 (patch) | |
tree | ebe4f5e941eb3bda28593c2b170101867cb0afe3 /tools/designer/src/lib | |
parent | 412920402f488c2cf6eb81e7582f9b5aa7b06680 (diff) | |
parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
download | Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.zip Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.gz Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
.gitignore
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'tools/designer/src/lib')
-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); |