From e6b23dc2e5b7a76a800555b178fb1d2ae8351f96 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Oct 2016 11:11:33 +0200 Subject: 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 --- qbs/modules/libclang/functions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qbs') 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) -- cgit v1.2.1 From 19e026d7dba9ab41023547002ecc06f431dba02a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 21 Oct 2016 15:01:25 +0200 Subject: Clang: Fix using forward slashes for CLANG_RESOURCE_DIR in qbs Change-Id: I251567529ec33ef76043006c68749724208cc811 Reviewed-by: Friedemann Kleint Reviewed-by: Christian Kandeler --- qbs/modules/libclang/functions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qbs') diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 3027aff4ed..49f2512423 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -58,12 +58,12 @@ function llvmConfig(qbs, qtcFunctions) function includeDir(llvmConfig) { - return FileInfo.toNativeSeparators(readOutput(llvmConfig, ["--includedir"])); + return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--includedir"])); } function libDir(llvmConfig) { - return FileInfo.toNativeSeparators(readOutput(llvmConfig, ["--libdir"])); + return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--libdir"])); } function version(llvmConfig) -- cgit v1.2.1