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 | 6bfdd24d0f988b47df8027dd8eb60d786a8a5571 (patch) | |
| tree | b3e30fa9bf81d9f600ea3aec7e373d20a288c40a /mkspecs | |
| parent | 26dc6d41c48b15515a9439c91969c167e5599b3f (diff) | |
| download | qtivi-6bfdd24d0f988b47df8027dd8eb60d786a8a5571.tar.gz | |
ivigenerator: Fix python module pathv5.15.0_QtAS
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 8c07d05..551b8c8 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 |