diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:30:21 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:32:02 +0300 |
| commit | 687466ac4748c82d8a56aff3f2f5901f929a4bcd (patch) | |
| tree | 426992ddc3e43b5d5522a781065287beaee5e0a0 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | f047e1a2a2ac6667d7d19c95e3f6bb96e17f2a5a (diff) | |
| parent | b89888ca9d6d10c850619c726e38584ca6637578 (diff) | |
| download | qt-creator-687466ac4748c82d8a56aff3f2f5901f929a4bcd.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index e21fedef4c..0d89c12f33 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -393,7 +393,7 @@ void CompilerOptionsBuilder::addDefineFloat128ForMingw() // CLANG-UPGRADE-CHECK: Workaround still needed? // https://llvm.org/bugs/show_bug.cgi?id=30685 if (m_projectPart.toolchainType == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) - addDefine("#define __float128 void"); + addDefine("#define __float128 short"); } QString CompilerOptionsBuilder::includeDirOption() const |