aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
diff options
context:
space:
mode:
authorEike Ziller <[email protected]>2022-05-12 11:08:06 +0200
committerEike Ziller <[email protected]>2022-05-12 11:00:51 +0000
commitff83642681ae4717a9e9c81753719483fe0f17f7 (patch)
tree28d7a8afed6b056baa06b4fbb001e473c86725b3 /src/plugins/clangcodemodel/clangcodemodelplugin.cpp
parent35963fd2b870c7803baf9e24ecd4f2286da1fd04 (diff)
ClangCodeModel: Use Utils::runAsync instead of QtConcurrent::run
That works the same with Qt 5 and Qt 6. This reverts commit c1fcaa28775240af47c62c479918d6f08e74617d. Change-Id: I603e50c793c2477454253a57bfe01eb25ecab6e3 Reviewed-by: <[email protected]> Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcodemodelplugin.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 49cd18ba95f..17cd0b6ba9a 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -35,6 +35,8 @@
# include "test/clangfixittest.h"
#endif
+#include <utils/runextensions.h>
+
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/messagemanager.h>
@@ -51,8 +53,6 @@
#include <texteditor/textmark.h>
-#include <QtConcurrent>
-
using namespace Utils;
namespace ClangCodeModel {
@@ -83,11 +83,11 @@ void ClangCodeModelPlugin::generateCompilationDB()
const CppEditor::ClangDiagnosticConfig warningsConfig
= warningsConfigForProject(target->project());
QFuture<GenerateCompilationDbResult> task
- = QtConcurrent::run(&Internal::generateCompilationDB, projectInfo,
- projectInfo->buildRoot(), CompilationDbPurpose::Project,
- qMakePair(warningsConfig,
- optionsForProject(target->project(), warningsConfig)),
- FilePath());
+ = Utils::runAsync(&Internal::generateCompilationDB, projectInfo,
+ projectInfo->buildRoot(), CompilationDbPurpose::Project,
+ warningsConfig,
+ optionsForProject(target->project(), warningsConfig),
+ FilePath());
Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db");
m_generatorWatcher.setFuture(task);
}