diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:00:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:03:01 +0100 |
| commit | 8f569c740a91b98365dcdaee2444038ce4957a76 (patch) | |
| tree | 749302d8bf9023ae51873a74dc641fd005744502 /examples/widgets | |
| parent | 465e93aa95d99f799300867b07f81bdd5162c9f1 (diff) | |
| parent | e8ad49d6cba6521f20b1b08bf65d92fc81c158e4 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
config.tests/common/atomic64/atomic64.cpp
configure
src/3rdparty/forkfd/forkfd.c
src/corelib/io/forkfd_qt.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
tools/configure/configureapp.cpp
Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/graphicsview/diagramscene/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp index a57dbaa9a0..02479c1a5a 100644 --- a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp @@ -389,7 +389,7 @@ void MainWindow::createActions() //! [23] sendBackAction = new QAction(QIcon(":/images/sendtoback.png"), tr("Send to &Back"), this); - sendBackAction->setShortcut(tr("Ctrl+B")); + sendBackAction->setShortcut(tr("Ctrl+T")); sendBackAction->setStatusTip(tr("Send item to back")); connect(sendBackAction, SIGNAL(triggered()), this, SLOT(sendToBack())); @@ -421,7 +421,7 @@ void MainWindow::createActions() connect(underlineAction, SIGNAL(triggered()), this, SLOT(handleFontChange())); aboutAction = new QAction(tr("A&bout"), this); - aboutAction->setShortcut(tr("Ctrl+B")); + aboutAction->setShortcut(tr("F1")); connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); } |