feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: fixed wrong flags check.

Browse Source 
Change-Id: I682e78c352066ddd05e96199fd8ead088e3e9f52
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Sergey Shambir
2013-05-26 18:15:24 +04:00
committed by Erik Verbruggen
parent 281c42c761
commit 0b724400aa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppmodelmanagerinterface.cpp
View File

@@ -79,25 +79,25 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc,
ToolChain::CompilerFlags c = (cxxflags == cflags) ToolChain::CompilerFlags c = (cxxflags == cflags)
? cxx : tc->compilerFlags(cflags); ? cxx : tc->compilerFlags(cflags);
if (c | ToolChain::StandardC11) if (c & ToolChain::StandardC11)
cVersion = C11; cVersion = C11;
else if (c | ToolChain::StandardC99) else if (c & ToolChain::StandardC99)
cVersion = C99; cVersion = C99;
else else
cVersion = C89; cVersion = C89;
if (cxx | ToolChain::StandardCxx11) if (cxx & ToolChain::StandardCxx11)
cxxVersion = CXX11; cxxVersion = CXX11;
else else
cxxVersion = CXX98; cxxVersion = CXX98;
if (cxx | ToolChain::BorlandExtensions) if (cxx & ToolChain::BorlandExtensions)
cxxExtensions |= BorlandExtensions; cxxExtensions |= BorlandExtensions;
if (cxx | ToolChain::GnuExtensions) if (cxx & ToolChain::GnuExtensions)
cxxExtensions |= GnuExtensions; cxxExtensions |= GnuExtensions;
if (cxx | ToolChain::MicrosoftExtensions) if (cxx & ToolChain::MicrosoftExtensions)
cxxExtensions |= MicrosoftExtensions; cxxExtensions |= MicrosoftExtensions;
if (cxx | ToolChain::OpenMP) if (cxx & ToolChain::OpenMP)
cxxExtensions |= OpenMP; cxxExtensions |= OpenMP;
cWarningFlags = tc->warningFlags(cflags); cWarningFlags = tc->warningFlags(cflags);