From a2653331330340c4f44457c49005f4c7226b8316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 10 Sep 2021 14:10:55 +0200 Subject: [PATCH] qdevice.pri: Use cmake separators for the path Because otherwise we may end up with trailing backslashes Pick-to: 6.2 6.2.0 6.1 Change-Id: I7ad24ec34c35f0a7b32241751bbcd2b26a8a23ea Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- cmake/QtPriHelpers.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index a7da0c25382..75e21c5ce21 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -681,7 +681,9 @@ function(qt_generate_global_device_pri_file) # Write android specific device info. if(ANDROID) + file(TO_CMAKE_PATH ${ANDROID_SDK_ROOT} ANDROID_SDK_ROOT) string(APPEND content "DEFAULT_ANDROID_SDK_ROOT = ${ANDROID_SDK_ROOT}\n") + file(TO_CMAKE_PATH ${ANDROID_NDK} ANDROID_NDK) string(APPEND content "DEFAULT_ANDROID_NDK_ROOT = ${ANDROID_NDK}\n") set(android_platform "android-23")