diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
| commit | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (patch) | |
| tree | b1292124a86c219fb434db4ec28e8f805ff52287 /tests/manual/dialogs/main.cpp | |
| parent | a74e4b85be83e2da47f4a1d8fcf0e78079335b80 (diff) | |
| parent | bab494e4d046f5617d19f5fec35eeff94377c51f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
src/printsupport/kernel/qcups.cpp
src/widgets/styles/qstyle.h
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
Diffstat (limited to 'tests/manual/dialogs/main.cpp')
| -rw-r--r-- | tests/manual/dialogs/main.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp index 6082727c3b..b2b5007662 100644 --- a/tests/manual/dialogs/main.cpp +++ b/tests/manual/dialogs/main.cpp @@ -70,6 +70,15 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) QAction *quitAction = fileMenu->addAction(tr("Quit")); quitAction->setShortcut(QKeySequence(QKeySequence::Quit)); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); + QMenu *editMenu = menuBar()->addMenu(tr("&Edit")); + QAction *action = editMenu->addAction(tr("Cut")); + action->setShortcut(QKeySequence(QKeySequence::Quit)); + action = editMenu->addAction(tr("Copy")); + action->setShortcut(QKeySequence(QKeySequence::Copy)); + action = editMenu->addAction(tr("Paste")); + action->setShortcut(QKeySequence(QKeySequence::Paste)); + action = editMenu->addAction(tr("Select All")); + action->setShortcut(QKeySequence(QKeySequence::SelectAll)); QTabWidget *tabWidget = new QTabWidget; tabWidget->addTab(new FileDialogPanel, tr("QFileDialog")); tabWidget->addTab(new ColorDialogPanel, tr("QColorDialog")); |