diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-14 04:24:59 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-14 04:24:59 (GMT) |
| commit | a8e4628a1f74b52a61b11b4b1fcc8ccdd4002a46 (patch) | |
| tree | bac5b6e440ac7e5c7f9fe1eee53a75fb44a7e9dd /examples/tools/undoframework/mainwindow.cpp | |
| parent | df69dfe0ec549a259ed78cf48dff898d8a044c41 (diff) | |
| parent | 9820412d2551b655fec24ffde7b2a56e3ad168ea (diff) | |
| download | Qt-a8e4628a1f74b52a61b11b4b1fcc8ccdd4002a46.zip Qt-a8e4628a1f74b52a61b11b4b1fcc8ccdd4002a46.tar.gz Qt-a8e4628a1f74b52a61b11b4b1fcc8ccdd4002a46.tar.bz2 | |
Merge branch 'master' of ../master into contiguouscache
Diffstat (limited to 'examples/tools/undoframework/mainwindow.cpp')
| -rw-r--r-- | examples/tools/undoframework/mainwindow.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/tools/undoframework/mainwindow.cpp b/examples/tools/undoframework/mainwindow.cpp index f912ff2..bf0aa41 100644 --- a/examples/tools/undoframework/mainwindow.cpp +++ b/examples/tools/undoframework/mainwindow.cpp @@ -101,16 +101,14 @@ void MainWindow::createActions() //! [5] undoAction = undoStack->createUndoAction(this, tr("&Undo")); - undoAction->setShortcut(tr("Ctrl+Z")); + undoAction->setShortcuts(QKeySequence::Undo); redoAction = undoStack->createRedoAction(this, tr("&Redo")); - QList<QKeySequence> redoShortcuts; - redoShortcuts << tr("Ctrl+Y") << tr("Shift+Ctrl+Z"); - redoAction->setShortcuts(redoShortcuts); + redoAction->setShortcuts(QKeySequence::Redo); //! [5] exitAction = new QAction(tr("E&xit"), this); - exitAction->setShortcut(tr("Ctrl+Q")); + exitAction->setShortcuts(QKeySequence::Quit); connect(exitAction, SIGNAL(triggered()), this, SLOT(close())); aboutAction = new QAction(tr("&About"), this); |