diff options
| author | Nikita Baryshnikov <nib952051@gmail.com> | 2014-07-24 18:04:15 +0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-08-07 15:08:26 +0200 |
| commit | 05ee8a8d5dcd54a1dbe137d62f26c13324c5e78d (patch) | |
| tree | b36976fd5564dbec509ab757c121c128cec82c57 /src/plugins/clangcodemodel | |
| parent | 0f3032f8403de34692edd5c12ed28b2ddfec777f (diff) | |
| download | qt-creator-05ee8a8d5dcd54a1dbe137d62f26c13324c5e78d.tar.gz | |
ClangCodeModel: discard stderr during clang detection
Otherwise we get useless noise in the General Messages pane if clang
isn't installed.
Change-Id: I8d34f79f1054b87b8530fcf6f253524a4c73897c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/clangcodemodel')
| -rw-r--r-- | src/plugins/clangcodemodel/clang_installation.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/clang_installation.pri b/src/plugins/clangcodemodel/clang_installation.pri index d1235f8337..584e844cae 100644 --- a/src/plugins/clangcodemodel/clang_installation.pri +++ b/src/plugins/clangcodemodel/clang_installation.pri @@ -64,13 +64,13 @@ win32 { unix { LLVM_CONFIG = $$findLLVMConfig() - LLVM_VERSION = $$system($$LLVM_CONFIG --version) + LLVM_VERSION = $$system($$LLVM_CONFIG --version 2>/dev/null) LLVM_VERSION = $$replace(LLVM_VERSION, ^(\\d+\\.\\d+).*$, \\1) message("... version $$LLVM_VERSION") - LLVM_INCLUDEPATH = $$system($$LLVM_CONFIG --includedir) + LLVM_INCLUDEPATH = $$system($$LLVM_CONFIG --includedir 2>/dev/null) isEmpty(LLVM_INCLUDEPATH):LLVM_INCLUDEPATH=$$LLVM_INSTALL_DIR/include - LLVM_LIBDIR = $$system($$LLVM_CONFIG --libdir) + LLVM_LIBDIR = $$system($$LLVM_CONFIG --libdir 2>/dev/null) isEmpty(LLVM_LIBDIR):LLVM_LIBDIR=$$LLVM_INSTALL_DIR/lib exists ($${LLVM_LIBDIR}/libclang.*) { |