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 | |
parent | 747346900501ed83c5af85ffe2fbfbd52c59099a (diff) | |
download | qt-creator-e6b23dc2e5b7a76a800555b178fb1d2ae8351f96.tar.gz |
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>
-rw-r--r-- | qbs/modules/libclang/functions.js | 5 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangcodemodel.pro | 3 |
2 files changed, 5 insertions, 3 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) diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index ff3ce0aea4..0d9b5ee96b 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -3,7 +3,8 @@ include(../../shared/clang/clang_installation.pri) # The following defines are used to determine the clang include path for intrinsics. DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" -DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" +CLANG_RESOURCE_DIR=$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include) +DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${CLANG_RESOURCE_DIR}\\\"\"" SOURCES += \ clangactivationsequencecontextprocessor.cpp \ |