| --- qt-creator-opensource-src-3.5.0-beta1/src/shared/clang/clang_installation.pri.orig 2015-07-07 14:02:27.000000000 +0100 |
| +++ qt-creator-opensource-src-3.5.0-beta1/src/shared/clang/clang_installation.pri 2015-07-08 16:29:43.546384900 +0100 |
| @@ -40,7 +40,7 @@ |
| } |
| } |
| |
| -win32 { |
| +win32:!win32-g++ { |
| LLVM_INCLUDEPATH = "$$LLVM_INSTALL_DIR/include" |
| LLVM_LIBDIR = $$findClangOnWindows() |
| isEmpty(LLVM_LIBDIR): error("Cannot find clang shared library at $${LLVM_INSTALL_DIR}") |
| @@ -53,7 +53,7 @@ |
| LLVM_LIBS += -ladvapi32 -lshell32 |
| } |
| |
| -unix { |
| +unix|win32-g++ { |
| llvm_config = $$LLVM_INSTALL_DIR/bin/llvm-config |
| exists($$llvm_config) { |
| #message("llvm-config found, querying it for paths and version") |
