diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2020-11-05 13:39:30 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2020-11-05 13:39:30 +0100 |
| commit | e3a422dbe9103dccef14b6e24eb79a6f187a6199 (patch) | |
| tree | 8963348cd6de4c4994a9858b2bfbdbe442fa1b46 | |
| parent | 027ad3c7810b17ebdb0f9572a49d9b2e5b2bc4a7 (diff) | |
| parent | 36f105b6f8390035a5b4cbcf685b137fad697198 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I02dbc2b93bbfeb3f09ef3b5ed9bb2f6bd78a70e7
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 2 | ||||
| -rw-r--r-- | src/tools/ivigenerator/deploy-virtualenv-files.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 8c07d05..4ad8a09 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=$$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 |