diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
| commit | bcbe1c3438f38087b16465f5b5aeac5d54a42d40 (patch) | |
| tree | d939e5eb97c676fd8202595f405bcd8b0170175c /examples/tools/codecs/mainwindow.cpp | |
| parent | 1099908428c594d67fe1da740126f4acfcdc8a0a (diff) | |
| parent | c711885b5694a51f0c22908e57e74c60188bd879 (diff) | |
| download | Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.zip Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.gz Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'examples/tools/codecs/mainwindow.cpp')
| -rw-r--r-- | examples/tools/codecs/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/tools/codecs/mainwindow.cpp b/examples/tools/codecs/mainwindow.cpp index 1e6fa69..5d3b7ac 100644 --- a/examples/tools/codecs/mainwindow.cpp +++ b/examples/tools/codecs/mainwindow.cpp @@ -156,7 +156,7 @@ void MainWindow::findCodecs() void MainWindow::createActions() { openAct = new QAction(tr("&Open..."), this); - openAct->setShortcut(tr("Ctrl+O")); + openAct->setShortcuts(QKeySequence::Open); connect(openAct, SIGNAL(triggered()), this, SLOT(open())); foreach (QTextCodec *codec, codecs) { @@ -169,7 +169,7 @@ void MainWindow::createActions() } exitAct = new QAction(tr("E&xit"), this); - exitAct->setShortcut(tr("Ctrl+Q")); + exitAct->setShortcuts(QKeySequence::Quit); connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); aboutAct = new QAction(tr("&About"), this); |