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

ClangTools: Always use CompilerOptionsBuilder for clang tools

Browse Source 
We do not ship clang-cl anymore which makes it impossible
to run clang with MSVC options.
Secondly we used to we tweak compiler options quite a bit so
why not to switch to CompilerOptionsBuilder totally?

Change-Id: Id323cb554587afaea7d9aa530e947a45a03922d1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-04-10 10:49:04 +02:00
parent 1bd967badb
commit 8936e51033
7 changed files with 3 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -1101,19 +1101,6 @@ QFuture<void> CppModelManager::updateProjectInfo(QFutureInterface<void> &futureI
return indexingFuture;
}
ProjectInfo CppModelManager::updateCompilerCallDataForProject(
ProjectExplorer::Project *project,
ProjectInfo::CompilerCallData &compilerCallData)
{
QMutexLocker locker(&d->m_projectMutex);
ProjectInfo projectInfo = d->m_projectToProjectsInfo.value(project, ProjectInfo());
projectInfo.setCompilerCallData(compilerCallData);
d->m_projectToProjectsInfo.insert(project, projectInfo);
return projectInfo;
}
ProjectPart::Ptr CppModelManager::projectPartForId(const QString &projectPartId) const
{
return d->m_projectPartIdToProjectProjectPart.value(projectPartId);

3
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -117,9 +117,6 @@ public:
QFuture<void> updateProjectInfo(QFutureInterface<void> &futureInterface,
const ProjectInfo &newProjectInfo);
ProjectInfo updateCompilerCallDataForProject(ProjectExplorer::Project *project,
ProjectInfo::CompilerCallData &compilerCallData);
/// \return The project part with the given project file
ProjectPart::Ptr projectPartForId(const QString &projectPartId) const;
/// \return All project parts that mention the given file name as one of the sources/headers.

18
src/plugins/cpptools/projectinfo.cpp
View File

@@ -91,28 +91,10 @@ const QSet<QString> ProjectInfo::sourceFiles() const
return m_sourceFiles;
}
void ProjectInfo::setCompilerCallData(const CompilerCallData &data)
{
m_compilerCallData = data;
}
ProjectInfo::CompilerCallData ProjectInfo::compilerCallData() const
{
return m_compilerCallData;
}
static bool operator==(const ProjectInfo::CompilerCallGroup &first,
const ProjectInfo::CompilerCallGroup &second)
{
return first.groupId == second.groupId
&& first.callsPerSourceFile == second.callsPerSourceFile;
}
bool ProjectInfo::operator ==(const ProjectInfo &other) const
{
return m_project == other.m_project
&& m_projectParts == other.m_projectParts
&& m_compilerCallData == other.m_compilerCallData
&& m_headerPaths == other.m_headerPaths
&& m_sourceFiles == other.m_sourceFiles
&& m_defines == other.m_defines;

11
src/plugins/cpptools/projectinfo.h
View File

@@ -95,16 +95,6 @@ public:
const QVector<ProjectPart::Ptr> projectParts() const;
const QSet<QString> sourceFiles() const;
struct CompilerCallGroup {
using CallsPerSourceFile = QHash<QString, QList<QStringList>>;
QString groupId;
CallsPerSourceFile callsPerSourceFile;
};
using CompilerCallData = QVector<CompilerCallGroup>;
void setCompilerCallData(const CompilerCallData &data);
CompilerCallData compilerCallData() const;
// Comparisons
bool operator ==(const ProjectInfo &other) const;
bool operator !=(const ProjectInfo &other) const;
@@ -119,7 +109,6 @@ public:
private:
QPointer<ProjectExplorer::Project> m_project;
QVector<ProjectPart::Ptr> m_projectParts;
CompilerCallData m_compilerCallData;
// The members below are (re)calculated from the project parts with finish()
ProjectPartHeaderPaths m_headerPaths;