summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanagerinterface.cpp
diff options
context:
space:
mode:
authorSergey Shambir <sergey.shambir.auto@gmail.com>2013-05-26 18:15:24 +0400
committerErik Verbruggen <erik.verbruggen@digia.com>2013-05-29 14:17:50 +0200
commit0b724400aa07249a844d40821d85acd89f2709df (patch)
tree75807a80687b0fcc732fc0428aad181f77525a41 /src/plugins/cpptools/cppmodelmanagerinterface.cpp
parent281c42c7614e12f6b2f5e444ca0818837c13fb05 (diff)
downloadqt-creator-0b724400aa07249a844d40821d85acd89f2709df.tar.gz
CppTools: fixed wrong flags check.
Change-Id: I682e78c352066ddd05e96199fd8ead088e3e9f52 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanagerinterface.cpp14
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);