diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-02 16:52:05 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-06-02 15:22:18 +0000 |
| commit | fca48bce00940f2aff54b6f8543649dbaf4f2dee (patch) | |
| tree | ca7c65ee76cba519d07995849651efc145ff3eeb /mkspecs | |
| parent | 9160c4e8340fb8083ed45175fab8a8d04f5e2037 (diff) | |
| download | qtivi-fca48bce00940f2aff54b6f8543649dbaf4f2dee.tar.gz | |
ivigenerator: virtualenv fixes for windows and refactoring
Inside the virtualenv we only need to call 'python' and 'pip'.
There is no need to add a suffix on windows or use the full path.
Removed the check for pip in PATH as we only need to have it packaged
in the virtualenv, so we are just checking whether the module works
in the python installation and hope it also works in the created
virtualenv.
Added more clear errors in case python is not found or the submodules
are not cloned.
Change-Id: If6473785edc4e57c9eb62934cc18daf692b04476
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 487dcbe..fcbd729 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -31,7 +31,7 @@ else: IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator win32: VIRTUALENV_ACTIVATION = $$VIRTUALENV_PATH/Scripts/activate && else: VIRTUALENV_ACTIVATION = . $$VIRTUALENV_PATH/bin/activate && -IVI_GENERATOR = $$VIRTUALENV_ACTIVATION python3 $$IVI_GENERATOR_PATH/generate.py +IVI_GENERATOR = $$VIRTUALENV_ACTIVATION python $$IVI_GENERATOR_PATH/generate.py # TODO make this work with multiple input files, or only support one QFACE_SOURCE qface_sources.output = $$QFACE_OUTPUT_DIR/$${QFACE_MODULE_NAME}.pri |