feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
This commit is contained in:
Orgad Shaneh
2017-06-20 11:30:21 +03:00
parent f047e1a2a2 b89888ca9d
commit 687466ac47
48 changed files with 3004 additions and 2039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -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