summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib/shared/newactiondialog.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-04-15 06:18:30 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-04-15 06:18:30 (GMT)
commit6c4b9cb575292f5f81afc772d993c1a53eb96ea5 (patch)
treef06be19545a6e7521707060c4d56eaeb2ba2c16e /tools/designer/src/lib/shared/newactiondialog.cpp
parent3eb4aacf07c77876c6ce68e9746906424934433b (diff)
downloadQt-6c4b9cb575292f5f81afc772d993c1a53eb96ea5.zip
Qt-6c4b9cb575292f5f81afc772d993c1a53eb96ea5.tar.gz
Qt-6c4b9cb575292f5f81afc772d993c1a53eb96ea5.tar.bz2
Display QAction keyboard shortcuts in action editor correctly.
Use PropertySheetKeySequenceValue instead of plain strings.
Diffstat (limited to 'tools/designer/src/lib/shared/newactiondialog.cpp')
-rw-r--r--tools/designer/src/lib/shared/newactiondialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/newactiondialog.cpp b/tools/designer/src/lib/shared/newactiondialog.cpp
index 53aec4b..bb163d6 100644
--- a/tools/designer/src/lib/shared/newactiondialog.cpp
+++ b/tools/designer/src/lib/shared/newactiondialog.cpp
@@ -134,7 +134,7 @@ ActionData NewActionDialog::actionData() const
rc.toolTip = m_ui->tooltipEditor->text();
rc.icon = m_ui->iconSelector->icon();
rc.checkable = m_ui->checkableCheckBox->checkState() == Qt::Checked;
- rc.keysequence = m_ui->keySequenceEdit->keySequence();
+ rc.keysequence = PropertySheetKeySequenceValue(m_ui->keySequenceEdit->keySequence());
return rc;
}
@@ -144,7 +144,7 @@ void NewActionDialog::setActionData(const ActionData &d)
m_ui->editObjectName->setText(d.name);
m_ui->iconSelector->setIcon(d.icon);
m_ui->tooltipEditor->setText(d.toolTip);
- m_ui->keySequenceEdit->setKeySequence(d.keysequence);
+ m_ui->keySequenceEdit->setKeySequence(d.keysequence.value());
m_ui->checkableCheckBox->setCheckState(d.checkable ? Qt::Checked : Qt::Unchecked);
m_auto_update_object_name = false;