diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /examples/widgets/graphicsview | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'examples/widgets/graphicsview')
| -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())); } |