Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-16 11:06:40 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-16 11:29:19 +0200
commit850b6faeaa580176863b3933e13c08b467720937 (patch)
tree7da91355ef090370e932b6525816dcd353a44143 /examples/scriptableapplication/mainwindow.cpp
parent3c551005dcb8de4bb083aa934a8fdff1298f14f9 (diff)
scriptableapplication: Fix deprecated API
Use QScreen and operator | for shortcuts. Change-Id: I9756a63622683b362eab90083795704c29738936 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/scriptableapplication/mainwindow.cpp')
-rw-r--r--examples/scriptableapplication/mainwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/scriptableapplication/mainwindow.cpp b/examples/scriptableapplication/mainwindow.cpp
index ef4a2f2e0..53aea3c71 100644
--- a/examples/scriptableapplication/mainwindow.cpp
+++ b/examples/scriptableapplication/mainwindow.cpp
@@ -79,13 +79,13 @@ MainWindow::MainWindow()
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
const QIcon runIcon = QIcon::fromTheme(QStringLiteral("system-run"));
QAction *runAction = fileMenu->addAction(runIcon, tr("&Run..."), this, &MainWindow::slotRunScript);
- runAction->setShortcut(Qt::CTRL + Qt::Key_R);
+ runAction->setShortcut(Qt::CTRL | Qt::Key_R);
QAction *diagnosticAction = fileMenu->addAction(tr("&Print Diagnostics"), this, &MainWindow::slotPrintDiagnostics);
- diagnosticAction->setShortcut(Qt::CTRL + Qt::Key_D);
+ diagnosticAction->setShortcut(Qt::CTRL | Qt::Key_D);
fileMenu->addAction(tr("&Invoke testFunction1()"), this, &MainWindow::testFunction1);
const QIcon quitIcon = QIcon::fromTheme(QStringLiteral("application-exit"));
QAction *quitAction = fileMenu->addAction(quitIcon, tr("&Quit"), qApp, &QCoreApplication::quit);
- quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
+ quitAction->setShortcut(Qt::CTRL | Qt::Key_Q);
QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
const QIcon clearIcon = QIcon::fromTheme(QStringLiteral("edit-clear"));