diff options
author | Dominik Holland <dominik.holland@qt.io> | 2020-06-18 16:00:12 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2020-06-19 17:01:20 +0200 |
commit | 6143b8a8a37397fecfed3350ca75f297e02c28bd (patch) | |
tree | ce9e336c48ed42e11876ec31ac77d61533c6c88e /mkspecs | |
parent | 6e9df17f0c4c65a414b2c1d96061c891cabeddd4 (diff) |
ivigenerator: Fix python module path
With the newer python versions we need to set the VIRTUAL_ENV in addition
to the PYTHONHOME environment variable to make sure the "site-packages"
is included in the module search path and to use the correct python
lib location.
Change-Id: Id6ce17ec91843534d6b3ebc49de7fcb2e889759a
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/ivigenerator.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 8c07d059..551b8c89 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -64,10 +64,12 @@ qtConfig(system-qface) { PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe # No space between the path and && otherwise python3 adds the space to the path ENV += set PYTHONHOME=$$system_path($$VIRTUALENV_PATH)&& + ENV += set VIRTUAL_ENV=%PYTHONHOME%&& } else { PYTHON = $$VIRTUALENV_PATH/bin/python ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)" ENV += PYTHONHOME=$$system_path($$VIRTUALENV_PATH) + ENV += VIRTUAL_ENV=$PYTHONHOME } } IVI_GENERATOR = $$system_quote($$PYTHON) $$IVI_GENERATOR_PATH/generate.py |