diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-21 11:11:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-21 10:29:40 +0000 |
| commit | e6b23dc2e5b7a76a800555b178fb1d2ae8351f96 (patch) | |
| tree | 0c10465fd78e35b9a0aed07582246aa3a1b60586 /qbs | |
| parent | 747346900501ed83c5af85ffe2fbfbd52c59099a (diff) | |
clangcodemodel: Use forward slashes for CLANG_RESOURCE_DIR define
Adapt qmake and qbs files, fixing warnings on Windows:
clangutils.cpp(78): warning C4129: 'o': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'L': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'l': unrecognized character escape sequence
Change-Id: I7a5fe674665437582457645f2a081e1e38d5df77
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs')
| -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..3027aff4ed 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.toNativeSeparators(readOutput(llvmConfig, ["--includedir"])); } function libDir(llvmConfig) { - return readOutput(llvmConfig, ["--libdir"]) + return FileInfo.toNativeSeparators(readOutput(llvmConfig, ["--libdir"])); } function version(llvmConfig) |