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

Clang: macOS: fix unknown integer types

Browse Source 
Always exclude clang include paths which do not come
with libclang used by code model.
This solves the issue with GCC that uses system clang
include folder on macOS.

Task-number: QTCREATORBUG-19397
Change-Id: I3b4845248a3cf03a95fbd4038856f8fb31346bfa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-01-02 15:26:08 +01:00
parent 30bd05b792
commit b861e31f1a
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/clangcompileroptionsbuilder.cpp
View File

@@ -89,16 +89,6 @@ ClangCompilerOptionsBuilder::ClangCompilerOptionsBuilder(const CppTools::Project
{ {
} }
bool ClangCompilerOptionsBuilder::excludeHeaderPath(const QString &path) const
{
if (m_projectPart.toolchainType == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID
&& path.contains("lib/gcc/i686-apple-darwin")) {
return true;
}
return CompilerOptionsBuilder::excludeHeaderPath(path);
}
void ClangCompilerOptionsBuilder::addPredefinedHeaderPathsOptions() void ClangCompilerOptionsBuilder::addPredefinedHeaderPathsOptions()
{ {
add("-undef"); add("-undef");

2
src/plugins/cpptools/clangcompileroptionsbuilder.h
View File

@@ -44,8 +44,6 @@ public:
virtual void addPredefinedHeaderPathsOptions(); virtual void addPredefinedHeaderPathsOptions();
virtual void addExtraOptions(); virtual void addExtraOptions();
bool excludeHeaderPath(const QString &path) const override;
virtual void addWrappedQtHeadersIncludePath(); virtual void addWrappedQtHeadersIncludePath();
void addProjectConfigFileInclude(); void addProjectConfigFileInclude();

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

@@ -440,16 +440,13 @@ bool CompilerOptionsBuilder::excludeDefineDirective(const ProjectExplorer::Macro
bool CompilerOptionsBuilder::excludeHeaderPath(const QString &headerPath) const bool CompilerOptionsBuilder::excludeHeaderPath(const QString &headerPath) const
{ {
// A clang tool chain might have another version and passing in the // Always exclude clang system includes (including intrinsics) which do not come with libclang
// intrinsics path from that version will lead to errors (unknown // that Qt Creator uses for code model.
// intrinsics, unfavorable order with regard to include_next). // For example GCC on macOS uses system clang include path which makes clang code model
if (m_projectPart.toolchainType == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) { // include incorrect system headers.
static QRegularExpression clangIncludeDir( static QRegularExpression clangIncludeDir(
QLatin1String("\\A.*/lib/clang/\\d+\\.\\d+(\\.\\d+)?/include\\z")); QLatin1String("\\A.*/lib/clang/\\d+\\.\\d+(\\.\\d+)?/include\\z"));
return clangIncludeDir.match(headerPath).hasMatch(); return clangIncludeDir.match(headerPath).hasMatch();
} }
return false;
}
} // namespace CppTools } // namespace CppTools