Merge remote-tracking branch 'origin/4.2'

Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421

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)