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

ClangCodeModel: Fix build with Qt 5.15

Browse Source 
Artificially lower the number of function parameters in
generateCompilationDB(), to accommodate Qt5's QtConcurrent::run().

Change-Id: Ide88925deb443378b9308d924406ec6f6f90e8aa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-05-10 16:28:49 +02:00
parent c5f424d696
commit c1fcaa2877
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -85,8 +85,8 @@ void ClangCodeModelPlugin::generateCompilationDB()
QFuture<GenerateCompilationDbResult> task QFuture<GenerateCompilationDbResult> task
= QtConcurrent::run(&Internal::generateCompilationDB, projectInfo, = QtConcurrent::run(&Internal::generateCompilationDB, projectInfo,
projectInfo->buildRoot(), CompilationDbPurpose::Project, projectInfo->buildRoot(), CompilationDbPurpose::Project,
warningsConfig, qMakePair(warningsConfig,
optionsForProject(target->project(), warningsConfig), optionsForProject(target->project(), warningsConfig)),
FilePath()); FilePath());
Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db"); Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db");
m_generatorWatcher.setFuture(task); m_generatorWatcher.setFuture(task);

3
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -424,7 +424,8 @@ void ClangModelManagerSupport::updateLanguageClient(
const ClangDiagnosticConfig warningsConfig = warningsConfigForProject(project); const ClangDiagnosticConfig warningsConfig = warningsConfigForProject(project);
auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo, jsonDbDir, auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo, jsonDbDir,
CompilationDbPurpose::CodeModel, CompilationDbPurpose::CodeModel,
warningsConfig, optionsForProject(project, warningsConfig), qMakePair(warningsConfig,
optionsForProject(project, warningsConfig)),
includeDir); includeDir);
generatorWatcher->setFuture(future); generatorWatcher->setFuture(future);
m_generatorSynchronizer.addFuture(future); m_generatorSynchronizer.addFuture(future);

16
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -168,12 +168,12 @@ static QJsonObject createFileObject(const FilePath &buildDir,
return fileObject; return fileObject;
} }
GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::ConstPtr projectInfo, GenerateCompilationDbResult generateCompilationDB(
const Utils::FilePath &baseDir, const CppEditor::ProjectInfo::ConstPtr projectInfo,
CompilationDbPurpose purpose, const Utils::FilePath &baseDir,
const ClangDiagnosticConfig &warningsConfig, CompilationDbPurpose purpose,
const QStringList &projectOptions, const QPair<ClangDiagnosticConfig, QStringList> &configAndOptions,
const FilePath &clangIncludeDir) const FilePath &clangIncludeDir)
{ {
QTC_ASSERT(!baseDir.isEmpty(), return GenerateCompilationDbResult(QString(), QTC_ASSERT(!baseDir.isEmpty(), return GenerateCompilationDbResult(QString(),
QCoreApplication::translate("ClangUtils", "Could not retrieve build directory."))); QCoreApplication::translate("ClangUtils", "Could not retrieve build directory.")));
@@ -190,11 +190,11 @@ GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::
compileCommandsFile.write("["); compileCommandsFile.write("[");
const UsePrecompiledHeaders usePch = getPchUsage(); const UsePrecompiledHeaders usePch = getPchUsage();
const QJsonArray jsonProjectOptions = QJsonArray::fromStringList(projectOptions); const QJsonArray jsonProjectOptions = QJsonArray::fromStringList(configAndOptions.second);
for (ProjectPart::ConstPtr projectPart : projectInfo->projectParts()) { for (ProjectPart::ConstPtr projectPart : projectInfo->projectParts()) {
QStringList args; QStringList args;
const CompilerOptionsBuilder optionsBuilder = clangOptionsBuilder( const CompilerOptionsBuilder optionsBuilder = clangOptionsBuilder(
*projectPart, warningsConfig, clangIncludeDir); *projectPart, configAndOptions.first, clangIncludeDir);
QJsonArray ppOptions; QJsonArray ppOptions;
if (purpose == CompilationDbPurpose::Project) { if (purpose == CompilationDbPurpose::Project) {
args = projectPartArguments(*projectPart); args = projectPartArguments(*projectPart);

2
src/plugins/clangcodemodel/clangutils.h
View File

@@ -90,7 +90,7 @@ public:
enum class CompilationDbPurpose { Project, CodeModel }; enum class CompilationDbPurpose { Project, CodeModel };
GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::ConstPtr projectInfo, GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::ConstPtr projectInfo,
const Utils::FilePath &baseDir, CompilationDbPurpose purpose, const Utils::FilePath &baseDir, CompilationDbPurpose purpose,
const CppEditor::ClangDiagnosticConfig &warningsConfig, const QStringList &projectOptions, const QPair<CppEditor::ClangDiagnosticConfig, QStringList> &configAndOptions,
const Utils::FilePath &clangIncludeDir); const Utils::FilePath &clangIncludeDir);
class DiagnosticTextInfo class DiagnosticTextInfo