diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-26 08:24:26 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-26 08:24:26 +0300 |
| commit | 5f973de952ad4c763e28ac92a65d4ae66c6ee25b (patch) | |
| tree | aa37a64a0a9af52c6327e9105ea3aba4aa5436d0 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 59a0aeb739a7402d0dcf567bb67df4dca82bc1d5 (diff) | |
| parent | 29cf39bfd6424364eeefd07e65cc0c613848ced2 (diff) | |
| download | qt-creator-5f973de952ad4c763e28ac92a65d4ae66c6ee25b.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: Ib5405ed2c3356f65b49fe2f454f8ac2e0de44ef6
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 0d89c12f33..8f5fd397fb 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -300,6 +300,7 @@ void CompilerOptionsBuilder::addDefineToAvoidIncludingGccOrMinGwIntrinsics() if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID) { addDefine("#define _X86INTRIN_H_INCLUDED"); + addDefine("#define BOOST_UUID_NO_SIMD"); } } |