From 850b6faeaa580176863b3933e13c08b467720937 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 16 Sep 2020 11:06:40 +0200 Subject: scriptableapplication: Fix deprecated API Use QScreen and operator | for shortcuts. Change-Id: I9756a63622683b362eab90083795704c29738936 Reviewed-by: Christian Tismer --- examples/scriptableapplication/main.cpp | 4 ++-- examples/scriptableapplication/mainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/scriptableapplication') 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 -#include +#include 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")); -- cgit v1.2.3 From 38814354ff6a30258b79947304fd3a6be4dc7089 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 16 Sep 2020 14:55:15 +0200 Subject: Fix running scriptableapplication in a virtualenv on Linux with Python 3.8 Remove the environment setting introduced by 435bc2744cd108efc1511bf17117bd4f0de15b43 for Linux. It is required for Windows only due to the changed library load policy. On Linux, it causes: Fatal Python error: init_fs_encoding: failed to get the Python codec of the filesystem encoding Python runtime state: core initialized ModuleNotFoundError: No module named 'encodings' Task-number: PYSIDE-1236 Change-Id: I58e71f877b6cb754290a4d0ae41518255181fafc Reviewed-by: Christian Tismer --- examples/scriptableapplication/pythonutils.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'examples/scriptableapplication') 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); } } -- cgit v1.2.3