From f553e3d16a4e2c2f4953bdf1dbcfa355c393790f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 30 Apr 2020 11:41:31 +0200 Subject: [PATCH] qbs build: Fix sdktool autotest on Windows Make sure to fix the path separators for the macro that gets passed on the command line. Change-Id: I444883e6fc5a2b49d73a1fa52aa1ea26b207185c Reviewed-by: Christian Stenger --- tests/auto/sdktool/sdktool.qbs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/auto/sdktool/sdktool.qbs b/tests/auto/sdktool/sdktool.qbs index bd8b8d267a3..b7928c74875 100644 --- a/tests/auto/sdktool/sdktool.qbs +++ b/tests/auto/sdktool/sdktool.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs.FileInfo QtcAutotest { name: "sdktool autotest" @@ -8,5 +8,8 @@ QtcAutotest { files: "tst_sdktool.cpp" } - cpp.defines: base.concat(['SDKTOOL_DIR="' + qbs.installRoot + '/' + qtc.ide_libexec_path + '"']) + cpp.defines: base.concat([ + 'SDKTOOL_DIR="' + FileInfo.joinPaths(FileInfo.fromNativeSeparators(qbs.installRoot), + qtc.ide_libexec_path) + '"' + ]) }