diff options
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 6 | ||||
| -rw-r--r-- | src/tools/ivigenerator/qface_internal_build.pri | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 4894f49..05d9972 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -39,9 +39,9 @@ IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator 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 python $$IVI_GENERATOR_PATH/generate.py +win32: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe +else: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/bin/python +IVI_GENERATOR = $$VIRTUALENV_PYTHON $$IVI_GENERATOR_PATH/generate.py # The 'click' library used by the generator needs to have a utf8 locale setup. win32: ENV = chcp 65001 && diff --git a/src/tools/ivigenerator/qface_internal_build.pri b/src/tools/ivigenerator/qface_internal_build.pri index 35e6455..a7caf82 100644 --- a/src/tools/ivigenerator/qface_internal_build.pri +++ b/src/tools/ivigenerator/qface_internal_build.pri @@ -40,6 +40,7 @@ VIRTUALENV_EXE = "$$PYTHON3_EXE -m virtualenv" qtivi_qface_virtualenv.target = qtivi_qface_virtualenv qtivi_qface_virtualenv.commands = \ $$VIRTUALENV_EXE $${qtivi_qface_virtualenv.target} $$escape_expand(\n\t) \ + $$VIRTUALENV_EXE --relocatable $${qtivi_qface_virtualenv.target} $$escape_expand(\n\t) \ @echo "Set up virtualenv for qface, name: $$qtivi_qface_virtualenv.target" QMAKE_EXTRA_TARGETS += qtivi_qface_virtualenv @@ -58,7 +59,7 @@ qtivi_qface_install.depends = qtivi_qface_virtualenv qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/setup.py qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/requirements.txt qtivi_qface_install.commands = $$VIRTUALENV_ACTIVATION \ - pip3 install -e $$QFACE_SOURCE_DIR $$escape_expand(\n\t) \ + pip3 install $$shell_path($$QFACE_SOURCE_DIR) $$escape_expand(\n\t) \ @echo "Installed qface development version into qtivi_qface_virtualenv" $$escape_expand(\n\t) win32: qtivi_qface_install.commands += @COPY /B $$shell_path($$OUT_PWD/forceRebuild)+,, $$shell_path($$OUT_PWD/forceRebuild) else: qtivi_qface_install.commands += @touch $$OUT_PWD/forceRebuild |