Use qmake system_path/quote instead of shell_path/quote

On windows we might run inside a mingw-shell but call normal
windows applications like python3. These applications work with
the system_path.
Using system_path should be fine in most cases as special shells
usually also accept system_path.

Task-number: COIN-239
Change-Id: Ibf45497a2e340bbba5ffc2cb4a6080ae858396c7
Reviewed-by: Simo Fält <simo.falt@qt.io>

3 files changed, 17 insertions, 17 deletions

diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf
index 399ab02..8c8bd8e 100644
--- a/mkspecs/features/ivigenerator.prf
+++ b/mkspecs/features/ivigenerator.prf
@@ -47,8 +47,8 @@ QT_FOR_CONFIG *= ivicore-private
 !isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI):!qtConfig(system-ivigenerator) {
     VIRTUALENV_PATH = $$INTERNAL_VIRTUALENV_PATH
     IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator
-    equals(QMAKE_HOST.os, Windows): ENV += set IVIGENERATOR_CONFIG="$$shell_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)" &&
-    else: ENV += IVIGENERATOR_CONFIG="$$shell_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)"
+    equals(QMAKE_HOST.os, Windows): ENV += set IVIGENERATOR_CONFIG="$$system_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)" &&
+    else: ENV += IVIGENERATOR_CONFIG="$$system_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)"
 }
 
 qtConfig(system-qface) {
@@ -64,10 +64,10 @@ qtConfig(system-qface) {
         PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe
     } else {
         PYTHON = $$VIRTUALENV_PATH/bin/python
-        ENV += LD_LIBRARY_PATH="$$shell_path($$VIRTUALENV_PATH/bin)"
+        ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)"
     }
 }
-IVI_GENERATOR = $$shell_quote($$PYTHON) $$IVI_GENERATOR_PATH/generate.py
+IVI_GENERATOR = $$system_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.
@@ -79,7 +79,7 @@ IVI_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT --force
 for (ANNOTATION, QFACE_ANNOTATIONS) {
     file = $$absolute_path($$ANNOTATION, $$_PRO_FILE_PWD_)
 
-    IVI_GENERATOR_OPTIONS += -A $$shell_path($$file)
+    IVI_GENERATOR_OPTIONS += -A $$system_path($$file)
     qface_sources.depends += $$file
     OTHER_FILES += $$file
 }
@@ -89,7 +89,7 @@ equals(QMAKE_HOST.os, Windows): SLEEP = ping -n 2 127.0.0.1 >nul
 else: SLEEP = sleep 1
 
 qface_sources.target = $$relative_path($$PRI, $$OUT_PWD)
-qface_sources.commands = $$SLEEP && $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR)
+qface_sources.commands = $$SLEEP && $$ENV $$system_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$system_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$system_path($$QFACE_OUTPUT_DIR)
 qface_sources.depends = $$IVI_GENERATOR_PATH/generate.py
 qface_sources.depends += $$QFACE_ABS_PWD/$${QFACE_FILE}
 qface_sources.depends += $$files($$IVI_GENERATOR_PATH/common/*)
diff --git a/src/ivicore/configure.pri b/src/ivicore/configure.pri
index 8be7d6f..6d404f9 100644
--- a/src/ivicore/configure.pri
+++ b/src/ivicore/configure.pri
@@ -9,13 +9,13 @@ defineTest(qtConfTest_python3) {
     for (python3_exe_name, PYTHON3_NAMES) {
         equals(QMAKE_HOST.os, Windows): python3_exe_name = $${python3_exe_name}.exe
 
-        python3_exe = $$shell_path($$qtConfFindInPath($$python3_exe_name, $$PYTHON3_PATH))
+        python3_exe = $$system_path($$qtConfFindInPath($$python3_exe_name, $$PYTHON3_PATH))
         isEmpty(python3_exe): \
             next();
 
-        qtRunLoggedCommand("$$shell_quote($$python3_exe) -c \"import platform; print(platform.python_version_tuple()[0])\"", py_major_version)|next()
+        qtRunLoggedCommand("$$system_quote($$python3_exe) -c \"import platform; print(platform.python_version_tuple()[0])\"", py_major_version)|next()
         equals(py_major_version, 3) {
-            qtRunLoggedCommand("$$shell_quote($$python3_exe) -c \"import platform; print(platform.python_version())\"", python_version)|next()
+            qtRunLoggedCommand("$$system_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("$$shell_quote($$python3_exe) -c \"import pkg_resources; print(pkg_resources.get_distribution('$${package}').version)\"", package_version)|return(false)
+    qtRunLoggedCommand("$$system_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 99b84a7..a46c4a4 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 = $$shell_quote($$QMAKE_PYTHON3_LOCATION) -m virtualenv
+VIRTUALENV_EXE = $$system_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 $$shell_quote($$QMAKE_PYTHON3_LOCATION)"
+VIRTUALENV_EXE += " -p $$system_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).
@@ -47,8 +47,8 @@ PYTHON3_SHORT_VERSION = $$member(PYTHON3_SHORT_VERSION_SPLITTED, 0).$$member(PYT
 
 # On the CI we use the special wheel folder when available to not download all packages again on each build
 PYTHON3_WHEEL_CACHE=$$(PYTHON3_WHEEL_CACHE)
-!isEmpty(PYTHON3_WHEEL_CACHE): PIP3_INSTALL_COMMAND = pip3 install --no-index --find-links=$$shell_path($$PYTHON3_WHEEL_CACHE) $$shell_path($$QFACE_SOURCE_DIR) --verbose
-else: PIP3_INSTALL_COMMAND = pip3 install --upgrade $$shell_path($$QFACE_SOURCE_DIR)
+!isEmpty(PYTHON3_WHEEL_CACHE): PIP3_INSTALL_COMMAND = pip3 install --no-index --find-links=$$system_path($$PYTHON3_WHEEL_CACHE) $$system_path($$QFACE_SOURCE_DIR) --verbose
+else: PIP3_INSTALL_COMMAND = pip3 install --upgrade $$system_path($$QFACE_SOURCE_DIR)
 
 # Always run this target
 equals(QMAKE_HOST.os, Windows): qtivi_qface_install.target = qtivi_qface_virtualenv/Lib/site-packages/qface
@@ -60,7 +60,7 @@ qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/qface/__about__.py
 qtivi_qface_install.commands = $$VIRTUALENV_ACTIVATION \
         $$PIP3_INSTALL_COMMAND $$escape_expand(\n\t) \
         @echo "Installed qface development version into qtivi_qface_virtualenv" $$escape_expand(\n\t)
-equals(QMAKE_HOST.os, Windows): qtivi_qface_install.commands += @COPY /B $$shell_path($$OUT_PWD/forceRebuild)+,, $$shell_path($$OUT_PWD/forceRebuild) >NUL
+equals(QMAKE_HOST.os, Windows): qtivi_qface_install.commands += @COPY /B $$system_path($$OUT_PWD/forceRebuild)+,, $$system_path($$OUT_PWD/forceRebuild) >NUL
 else: qtivi_qface_install.commands += @touch $$OUT_PWD/forceRebuild
 QMAKE_EXTRA_TARGETS += qtivi_qface_install
 
@@ -68,8 +68,8 @@ QMAKE_EXTRA_TARGETS += qtivi_qface_install
 # Otherwise it still needs some modules from the system
 deploy_virtualenv.target = .stamp-deploy_virtualenv
 equals(QMAKE_HOST.os, Windows) {
-    deploy_virtualenv.commands = $$shell_path($$PWD/deploy-virtualenv.bat) qtivi_qface_virtualenv $$escape_expand(\n\t)
-    deploy_virtualenv.commands += @type nul > $$shell_path($$OUT_PWD/.stamp-deploy_virtualenv)
+    deploy_virtualenv.commands = $$system_path($$PWD/deploy-virtualenv.bat) qtivi_qface_virtualenv $$escape_expand(\n\t)
+    deploy_virtualenv.commands += @type nul > $$system_path($$OUT_PWD/.stamp-deploy_virtualenv)
 } else {
     deploy_virtualenv.commands = $$PWD/deploy-virtualenv.sh qtivi_qface_virtualenv $$escape_expand(\n\t)
     deploy_virtualenv.commands += @touch $$OUT_PWD/.stamp-deploy_virtualenv