From 6bfdd24d0f988b47df8027dd8eb60d786a8a5571 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 18 Jun 2020 16:00:12 +0200 Subject: 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 --- mkspecs/features/ivigenerator.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs') 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 -- cgit v1.2.1