diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-17 07:56:30 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-17 08:22:55 +0200 |
| commit | 4c5e405e691f707f2765b5f920c28213a36d22e5 (patch) | |
| tree | 48000f220fc2c4365b276146e3d08a05c3a90312 /examples/scriptableapplication | |
| parent | 53181fb95d3884cc067d005f37accd92d128bccc (diff) | |
| parent | 38814354ff6a30258b79947304fd3a6be4dc7089 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8aa48d07067c45c888c73af87314f6a88c2a6e14
Diffstat (limited to 'examples/scriptableapplication')
| -rw-r--r-- | examples/scriptableapplication/main.cpp | 4 | ||||
| -rw-r--r-- | examples/scriptableapplication/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | examples/scriptableapplication/pythonutils.cpp | 2 |
3 files changed, 5 insertions, 7 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 0811990de..ed12f94b1 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")); diff --git a/examples/scriptableapplication/pythonutils.cpp b/examples/scriptableapplication/pythonutils.cpp index c5e18f256..d8c38026f 100644 --- a/examples/scriptableapplication/pythonutils.cpp +++ b/examples/scriptableapplication/pythonutils.cpp @@ -100,8 +100,6 @@ static void initVirtualEnvironment() if (QOperatingSystemVersion::currentType() == QOperatingSystemVersion::Windows && (PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8))) { qputenv("PYTHONPATH", virtualEnvPath + "\\Lib\\site-packages"); - } else { - qputenv("PYTHONHOME", virtualEnvPath); } } |