aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-01-05 13:40:25 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-05 16:01:15 +0000
commit39ed72638b893c7bb15472775a009252b2d3aee1 (patch)
tree25ec4648b7aec1164fdbcd90603b9a1588646834
parentf784714aea268248d17056320ac67d77c61eebe6 (diff)
scriptable application/Unix: Remove setting of PYTHONHOME for virtualenv
On Linux, with 3.8, it causes an error in conjunction with virtualenv: 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-841 Change-Id: Ibf1caa1a797faab5dd8e4bfa6eb23296bb7945a5 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 05db21e661c6ba9eb69516cb1386bcbd431b7d2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/scriptableapplication/pythonutils.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/examples/scriptableapplication/pythonutils.cpp b/examples/scriptableapplication/pythonutils.cpp
index c5e18f256..eef2fada7 100644
--- a/examples/scriptableapplication/pythonutils.cpp
+++ b/examples/scriptableapplication/pythonutils.cpp
@@ -94,14 +94,12 @@ static const char virtualEnvVar[] = "VIRTUAL_ENV";
// packages location.
static void initVirtualEnvironment()
{
- QByteArray virtualEnvPath = qgetenv(virtualEnvVar);
// As of Python 3.8, Python is no longer able to run stand-alone in a
// virtualenv due to missing libraries. Add the path to the modules instead.
if (QOperatingSystemVersion::currentType() == QOperatingSystemVersion::Windows
&& (PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8))) {
+ const QByteArray virtualEnvPath = qgetenv(virtualEnvVar);
qputenv("PYTHONPATH", virtualEnvPath + "\\Lib\\site-packages");
- } else {
- qputenv("PYTHONHOME", virtualEnvPath);
}
}