diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
| commit | 0a95b28147d9c4ea57ba9b025beec2d503399acf (patch) | |
| tree | 9032878c4c1b3877167990376d3871db70eb304c /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
| parent | cca4cbfb02da327c844c1291d43a8f7f6420e334 (diff) | |
| parent | 10d7d61e263573116965b1af53cdbda0f668211d (diff) | |
| download | qt-creator-0a95b28147d9c4ea57ba9b025beec2d503399acf.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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); |