diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-21 23:59:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-22 01:53:29 +0100 |
| commit | bf58c70546c5f9cb66d99b82abfde9ba1a056192 (patch) | |
| tree | df3675d3377ef6576f82fb167ebd67fcc900a91b /tests/manual | |
| parent | 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 (diff) | |
| parent | 41cba737a98b16a2767c55cda0532f38b6b6a37d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/io/qdir.cpp
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtimer.h
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/dialogs/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp index fc4adebcc0..2676ceeb52 100644 --- a/tests/manual/dialogs/main.cpp +++ b/tests/manual/dialogs/main.cpp @@ -94,7 +94,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) 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->setShortcut(QKeySequence(QKeySequence::Cut)); action = editMenu->addAction(tr("Copy")); action->setShortcut(QKeySequence(QKeySequence::Copy)); action = editMenu->addAction(tr("Paste")); |