Merge remote-tracking branch 'origin/3.3'

2015-01-14 16:06:46 +01:00
parent d78b1ba10f 4f1e9aa485
commit df3176d5e3
11 changed files with 166 additions and 43 deletions
--- a/src/plugins/clangcodemodel/clang_installation.pri
+++ b/src/plugins/clangcodemodel/clang_installation.pri
@@ -42,8 +42,9 @@ defineReplace(findClangOnWindows) {
    for (suffix, $$list(lib bin)) {
        for (libname, $$list(clang libclang)) {
            for (ext, FILE_EXTS) {
-                exists("$${LLVM_INSTALL_DIR}/$${suffix}/$${libname}.$${ext}")
+                exists("$${LLVM_INSTALL_DIR}/$${suffix}/$${libname}.$${ext}") {
                    return($${LLVM_INSTALL_DIR}/$${suffix}/)
+                }
            }
        }
    }