From fca48bce00940f2aff54b6f8543649dbaf4f2dee Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 2 Jun 2017 16:52:05 +0200 Subject: 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 --- mkspecs/features/ivigenerator.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') 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 -- cgit v1.2.1