ClangCodeModel: Fix build with Qt 5.15

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

View File

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