diff options
author | Topi Reinio <topi.reinio@qt.io> | 2020-08-27 16:27:31 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@qt.io> | 2020-08-27 22:49:23 +0000 |
commit | 371183e7a6fde77ec7e5416791dc4bcfc48cc55b (patch) | |
tree | 41668981a51dbdd128c2e85b1ce9f4c72f4d1ede | |
parent | 6bfdd24d0f988b47df8027dd8eb60d786a8a5571 (diff) |
Fix build issues
'$PYTHONHOME' in ivigenerator.prf expanded to 'YTHONHOME'.
Running generate.py failed with
ImportError: No module named 'tarfile'
Change-Id: I22517605b42eb23f46d9b1694b9ce5a516528327
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
-rw-r--r-- | mkspecs/features/ivigenerator.prf | 2 | ||||
-rw-r--r-- | src/tools/ivigenerator/deploy-virtualenv-files.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 551b8c8..4ad8a09 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -69,7 +69,7 @@ qtConfig(system-qface) { PYTHON = $$VIRTUALENV_PATH/bin/python ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)" ENV += PYTHONHOME=$$system_path($$VIRTUALENV_PATH) - ENV += VIRTUAL_ENV=$PYTHONHOME + ENV += VIRTUAL_ENV=$$system_path($$VIRTUALENV_PATH) } } IVI_GENERATOR = $$system_quote($$PYTHON) $$IVI_GENERATOR_PATH/generate.py diff --git a/src/tools/ivigenerator/deploy-virtualenv-files.txt b/src/tools/ivigenerator/deploy-virtualenv-files.txt index 5808a1e..97fec4c 100644 --- a/src/tools/ivigenerator/deploy-virtualenv-files.txt +++ b/src/tools/ivigenerator/deploy-virtualenv-files.txt @@ -3,6 +3,7 @@ io.py site.py os.py stat.py +tarfile.py ntpath.py genericpath.py re.py |