summaryrefslogtreecommitdiffstats
path: root/examples/help/simpletextviewer/mainwindow.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-13 14:38:44 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-13 14:38:44 (GMT)
commit5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1 (patch)
tree712cb1697a1f09439f77219c44ed90fb0223ff49 /examples/help/simpletextviewer/mainwindow.cpp
parentfdd2ad0813a856a00cac83ccff9bdd210b398c9c (diff)
parent9820412d2551b655fec24ffde7b2a56e3ad168ea (diff)
downloadQt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.zip
Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.gz
Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples/help/simpletextviewer/mainwindow.cpp')
-rw-r--r--examples/help/simpletextviewer/mainwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/help/simpletextviewer/mainwindow.cpp
index fc9af58..33092ca 100644
--- a/examples/help/simpletextviewer/mainwindow.cpp
+++ b/examples/help/simpletextviewer/mainwindow.cpp
@@ -102,12 +102,12 @@ void MainWindow::open()
void MainWindow::createActions()
{
assistantAct = new QAction(tr("Help Contents"), this);
- assistantAct->setShortcut(tr("F1"));
+ assistantAct->setShortcut(QKeySequence::HelpContents);
connect(assistantAct, SIGNAL(triggered()), this, SLOT(showDocumentation()));
//! [4]
openAct = new QAction(tr("&Open..."), this);
- openAct->setShortcut(tr("Ctrl+O"));
+ openAct->setShortcut(QKeySequence::Open);
connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
clearAct = new QAction(tr("&Clear"), this);
@@ -115,7 +115,7 @@ void MainWindow::createActions()
connect(clearAct, SIGNAL(triggered()), textViewer, SLOT(clear()));
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);