diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-04 10:52:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-04 10:52:34 +0200 |
| commit | be73f41ad4b0118672f358776a7d3c6bcf244448 (patch) | |
| tree | 2efc815259b7615d26c9f2c13c6c0e5c385a234b /tests/auto | |
| parent | 21e9947c218107607f66c3a61b61f2a9da77865e (diff) | |
| parent | f553e3d16a4e2c2f4953bdf1dbcfa355c393790f (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/sdktool/sdktool.qbs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/sdktool/sdktool.qbs b/tests/auto/sdktool/sdktool.qbs index bd8b8d267a..b7928c7487 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) + '"' + ]) } |