diff options
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 2 | ||||
| -rw-r--r-- | src/ivicore/configure.pri | 6 | ||||
| -rw-r--r-- | src/tools/ivigenerator/qface_internal_build.pri | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index b573610..88f5e9a 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -67,7 +67,7 @@ qtConfig(system-qface) { ENV += LD_LIBRARY_PATH="$$shell_path($$VIRTUALENV_PATH/bin)" } } -IVI_GENERATOR = $$PYTHON $$IVI_GENERATOR_PATH/generate.py +IVI_GENERATOR = $$shell_quote($$PYTHON) $$IVI_GENERATOR_PATH/generate.py # TODO make this work with multiple input files, or only support one QFACE_SOURCE # Although this could be extra_compiler it is a normal EXTRA_TARGET for a reason. diff --git a/src/ivicore/configure.pri b/src/ivicore/configure.pri index 2e6832c..8be7d6f 100644 --- a/src/ivicore/configure.pri +++ b/src/ivicore/configure.pri @@ -13,9 +13,9 @@ defineTest(qtConfTest_python3) { isEmpty(python3_exe): \ next(); - qtRunLoggedCommand("$$python3_exe -c \"import platform; print(platform.python_version_tuple()[0])\"", py_major_version)|next() + qtRunLoggedCommand("$$shell_quote($$python3_exe) -c \"import platform; print(platform.python_version_tuple()[0])\"", py_major_version)|next() equals(py_major_version, 3) { - qtRunLoggedCommand("$$python3_exe -c \"import platform; print(platform.python_version())\"", python_version)|next() + qtRunLoggedCommand("$$shell_quote($$python3_exe) -c \"import platform; print(platform.python_version())\"", python_version)|next() break() } } @@ -41,7 +41,7 @@ defineTest(qtConfTest_python3_package) { package = $$eval($${1}.package) version = $$eval($${1}.version) - qtRunLoggedCommand("$$python3_exe -c \"import pkg_resources; print(pkg_resources.get_distribution('$${package}').version)\"", package_version)|return(false) + qtRunLoggedCommand("$$shell_quote($$python3_exe) -c \"import pkg_resources; print(pkg_resources.get_distribution('$${package}').version)\"", package_version)|return(false) !isEmpty(version) { qtLog("Also checking for the exact version:") qtLog("Expected: $$version") diff --git a/src/tools/ivigenerator/qface_internal_build.pri b/src/tools/ivigenerator/qface_internal_build.pri index 250b0e0..25a9676 100644 --- a/src/tools/ivigenerator/qface_internal_build.pri +++ b/src/tools/ivigenerator/qface_internal_build.pri @@ -9,10 +9,10 @@ debug_and_release:build_pass:CONFIG(release, debug|release) { include($$shadowed($$PWD/../../ivicore/qtivicore-config.pri)) -VIRTUALENV_EXE = $$QMAKE_PYTHON3_LOCATION -m virtualenv +VIRTUALENV_EXE = $$shell_quote($$QMAKE_PYTHON3_LOCATION) -m virtualenv # virtualenv is always using the default interpreter, which is python2 on many systems" # by adding -p we enforce that the python3 interpreter is used and make sure python3 is installed in the virtualenv -VIRTUALENV_EXE += " -p $$QMAKE_PYTHON3_LOCATION" +VIRTUALENV_EXE += " -p $$shell_quote($$QMAKE_PYTHON3_LOCATION)" # Use a Python virtualenv for installing qface, so we don't pollute the user environment # On some systems virtualenv --always-copy doesn't work (https://github.com/pypa/virtualenv/issues/565). |