diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-10 14:10:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-10 19:13:11 +0000 |
| commit | 1fa6f1dcf62261d6ee20bcb351987ac4d7ee5942 (patch) | |
| tree | ef6d35a58ebb5fac8298c89eee27fffa342f9827 | |
| parent | fa9759db45044b1864b31e6f36f2228af86b4ce7 (diff) | |
qdevice.pri: Use cmake separators for the path
Because otherwise we may end up with trailing backslashes
Change-Id: I7ad24ec34c35f0a7b32241751bbcd2b26a8a23ea
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a2653331330340c4f44457c49005f4c7226b8316)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 0c5a80c118..d2cb12720e 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -641,7 +641,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") |