scriptableapplication: Fix deprecated API

Use QScreen and operator | for shortcuts.

Change-Id: I9756a63622683b362eab90083795704c29738936
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/examples/scriptableapplication/main.cpp b/examples/scriptableapplication/main.cpp
index d7cb4b6db..331417932 100644
--- a/examples/scriptableapplication/main.cpp
+++ b/examples/scriptableapplication/main.cpp
@@ -51,13 +51,13 @@
 #include "mainwindow.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     MainWindow mainWindow;
-    const QRect availableGeometry =  a.desktop()->availableGeometry(&mainWindow);
+    const QRect availableGeometry =  mainWindow.screen()->availableGeometry();
     mainWindow.resize(availableGeometry.width() / 2, availableGeometry.height() / 2);
     mainWindow.show();
     return a.exec();
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"));