From e60a337f4ed5c716b87f2318a2595c793fb4bca8 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 5 Oct 2020 09:57:54 +0300 Subject: Android: use shell path format when running qmake install step On Windows shell, using unix path format might not work, since the shell expects backslash paths only. Pick-to: 5.15 Task-number: QTBUG-87066 Change-Id: I51741b475c1ede11336df63ee1c6092c792c16ef Reviewed-by: Joerg Bornemann --- mkspecs/features/android/android.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/android') diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index ddb94ea22b..7f7fec85f7 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -4,7 +4,7 @@ TARGET_FOR_ANDROID_DEPLOYMENT_SETTINGS = $$TARGET !contains(TEMPLATE, subdirs): { apk_install_target.target = apk_install_target apk_install_target.depends = first - apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$OUT_PWD/android-build install + apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$shell_path($$OUT_PWD/android-build) install qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json -- cgit v1.2.3