Merge remote-tracking branch 'origin/3.5'

Change-Id: I8cc26f38a0ac2453c81108e449b6d84efc9e419c
This commit is contained in:
Eike Ziller
2015-09-08 07:36:31 +02:00
9 changed files with 12 additions and 10 deletions

View File

@@ -30,7 +30,7 @@ QtcPlugin {
property string llvmLibs: Clang.libraries(qbs.targetOS)
property string llvmVersion: Clang.version(llvmConfig, QtcProcessOutputReader)
condition: llvmConfig
condition: llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"))
cpp.includePaths: base.concat(llvmIncludeDir)
cpp.libraryPaths: base.concat(llvmLibDir)