From 0b724400aa07249a844d40821d85acd89f2709df Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Sun, 26 May 2013 18:15:24 +0400 Subject: CppTools: fixed wrong flags check. Change-Id: I682e78c352066ddd05e96199fd8ead088e3e9f52 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppmodelmanagerinterface.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp') diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp index 0de4f6e425..c6b535d98d 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.cpp +++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp @@ -79,25 +79,25 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc, ToolChain::CompilerFlags c = (cxxflags == cflags) ? cxx : tc->compilerFlags(cflags); - if (c | ToolChain::StandardC11) + if (c & ToolChain::StandardC11) cVersion = C11; - else if (c | ToolChain::StandardC99) + else if (c & ToolChain::StandardC99) cVersion = C99; else cVersion = C89; - if (cxx | ToolChain::StandardCxx11) + if (cxx & ToolChain::StandardCxx11) cxxVersion = CXX11; else cxxVersion = CXX98; - if (cxx | ToolChain::BorlandExtensions) + if (cxx & ToolChain::BorlandExtensions) cxxExtensions |= BorlandExtensions; - if (cxx | ToolChain::GnuExtensions) + if (cxx & ToolChain::GnuExtensions) cxxExtensions |= GnuExtensions; - if (cxx | ToolChain::MicrosoftExtensions) + if (cxx & ToolChain::MicrosoftExtensions) cxxExtensions |= MicrosoftExtensions; - if (cxx | ToolChain::OpenMP) + if (cxx & ToolChain::OpenMP) cxxExtensions |= OpenMP; cWarningFlags = tc->warningFlags(cflags); -- cgit v1.2.1