diff options
| author | Christian Kandeler <[email protected]> | 2022-05-10 16:28:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2022-05-11 07:40:30 +0000 |
| commit | c1fcaa28775240af47c62c479918d6f08e74617d (patch) | |
| tree | 02cfe418fd6d1b2f65688dd0ae6d2d574dfe6f60 /src/plugins/clangcodemodel/clangcodemodelplugin.cpp | |
| parent | c5f424d696eaa6fc450464359c55fd0c9a09c539 (diff) | |
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 <[email protected]>
Reviewed-by: <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcodemodelplugin.cpp')
| -rw-r--r-- | src/plugins/clangcodemodel/clangcodemodelplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp index a60023a9d72..49cd18ba95f 100644 --- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp +++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp @@ -85,8 +85,8 @@ void ClangCodeModelPlugin::generateCompilationDB() QFuture<GenerateCompilationDbResult> task = QtConcurrent::run(&Internal::generateCompilationDB, projectInfo, projectInfo->buildRoot(), CompilationDbPurpose::Project, - warningsConfig, - optionsForProject(target->project(), warningsConfig), + qMakePair(warningsConfig, + optionsForProject(target->project(), warningsConfig)), FilePath()); Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db"); m_generatorWatcher.setFuture(task); |