diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-02 08:57:02 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-02 10:11:07 +0200 |
| commit | 6441c258e61a0de41f3149f8ec7af302f4562189 (patch) | |
| tree | f0abbeda8f9cab13c24c23fb752ebc53d4f55504 | |
| parent | 082bf324feba9e180e243eabe499c6efd333f0ea (diff) | |
| download | qt-creator-6441c258e61a0de41f3149f8ec7af302f4562189.tar.gz | |
Fix typo (|| operator instead of |)
Change-Id: I2a5707f04175ef96d678e57b7c61fb8d6cec4d75
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 63b6b85cd9..31f4a47fe1 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -462,7 +462,7 @@ ToolChain::CompilerFlags GccToolChain::compilerFlags(const QStringList &cxxflags } else if (std == "gnu++0x" || std == "gnu++11" || std== "gnu++1y") { flags |= CompilerFlags(StandardCxx11 | GnuExtensions); } else if (std == "c89" || std == "c90" - || std == "iso9899:1990" | std == "iso9899:199409") { + || std == "iso9899:1990" || std == "iso9899:199409") { flags &= ~CompilerFlags(StandardC99 | StandardC11); } else if (std == "gnu89" || std == "gnu90") { flags &= ~CompilerFlags(StandardC99 | StandardC11); |