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

CppTools: Fix code model with clang and precompiled headers

Browse Source 
Amends a1d22fd2f7.

Fixes: QTCREATORBUG-22897
Change-Id: Iaadf72d78e11279c8dd553860e00be9d29135752
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-06 16:38:24 +01:00
parent 4f6ef7b698
commit ce3103194f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,19 +341,17 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders usePrecompiledHeaders) void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders usePrecompiledHeaders)
{ {
for (const QString &pchFile : m_projectPart.precompiledHeaders) { for (const QString &pchFile : m_projectPart.precompiledHeaders) {
// Bail if build system precomiple header artifacts exists // Bail if build system precompiled header artifacts exists.
// Clang cannot handle foreign PCH files. // Clang cannot handle foreign PCH files.
if (QFile::exists(pchFile + ".gch") || QFile::exists(pchFile + ".pch")) { if (QFile::exists(pchFile + ".gch") || QFile::exists(pchFile + ".pch"))
usePrecompiledHeaders = UsePrecompiledHeaders::No; usePrecompiledHeaders = UsePrecompiledHeaders::No;
// In case of Clang compilers, remove the pch-inclusion arguments
remove({"-Xclang", "-include-pch", "-Xclang", pchFile + ".gch"});
remove({"-Xclang", "-include-pch", "-Xclang", pchFile + ".pch"});
}
if (usePrecompiledHeaders == UsePrecompiledHeaders::No) { if (usePrecompiledHeaders == UsePrecompiledHeaders::No) {
// CMake PCH will already have force included the header file in // CMake PCH will already have force included the header file in
// command line options, remove it if exists. // command line options, remove it if exists.
// In case of Clang compilers, also remove the pch-inclusion arguments.
remove({"-Xclang", "-include-pch", "-Xclang", pchFile + ".gch"});
remove({"-Xclang", "-include-pch", "-Xclang", pchFile + ".pch"});
remove({isClStyle() ? QLatin1String(includeFileOptionCl) remove({isClStyle() ? QLatin1String(includeFileOptionCl)
: QLatin1String(includeFileOptionGcc), pchFile}); : QLatin1String(includeFileOptionGcc), pchFile});
} else if (QFile::exists(pchFile)) { } else if (QFile::exists(pchFile)) {