diff options
author | Eike Ziller <eike.ziller@qt.io> | 2016-10-24 13:17:22 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2016-10-24 13:17:28 +0200 |
commit | 7480f58cf1200e8ca41dcb2b73670f07e73290e7 (patch) | |
tree | c0bade085749fd763d3b976153019f4dd342ba71 /qbs/modules | |
parent | 4ca1fb0e9a71f6304033dd1ec19b11cf7fbccda2 (diff) | |
parent | 0f5f0c138ca5812256f678592198ed4eddc24f25 (diff) | |
download | qt-creator-7480f58cf1200e8ca41dcb2b73670f07e73290e7.tar.gz |
Merge remote-tracking branch 'origin/4.2'
Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421
Diffstat (limited to 'qbs/modules')
-rw-r--r-- | qbs/modules/libclang/functions.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index e09ebef1ee..49f2512423 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,5 +1,6 @@ var Environment = loadExtension("qbs.Environment") var File = loadExtension("qbs.File") +var FileInfo = loadExtension("qbs.FileInfo") var MinimumLLVMVersion = "3.8.0" var Process = loadExtension("qbs.Process") @@ -57,12 +58,12 @@ function llvmConfig(qbs, qtcFunctions) function includeDir(llvmConfig) { - return readOutput(llvmConfig, ["--includedir"]) + return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--includedir"])); } function libDir(llvmConfig) { - return readOutput(llvmConfig, ["--libdir"]) + return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--libdir"])); } function version(llvmConfig) |