aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangtools/clangtoolrunner.cpp
diff options
context:
space:
mode:
authorJarek Kobus <[email protected]>2023-01-20 10:44:21 +0100
committerJarek Kobus <[email protected]>2023-01-20 14:18:56 +0000
commit98ff1d32f92073cfafbf0daffec9f1a98f92c1eb (patch)
treef114645388784c124b25ad5d19c88a96983f1526 /src/plugins/clangtools/clangtoolrunner.cpp
parent01faf0843dd7b1641159b2b0a669ac80a6065558 (diff)
TaskTree: Remove GroupConfig / GroupAction
Use TaskAction for dynamic group setup. Get rid of possibility of selecting group's children to be started inside group setup. Use dynamic children's setup instead, so that each individual child may decide itself whether it wants to be started or not. Change-Id: Ie31f707791db0dc26be92663ca6238b8e49c3b98 Reviewed-by: hjk <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
Diffstat (limited to 'src/plugins/clangtools/clangtoolrunner.cpp')
-rw-r--r--src/plugins/clangtools/clangtoolrunner.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index 1d74b4b3db9..08e93996233 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -122,25 +122,24 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
};
const auto onGroupSetup = [=] {
- const GroupConfig error = GroupConfig{GroupAction::StopWithError};
if (setupHandler && !setupHandler())
- return error;
+ return TaskAction::StopWithError;
ClangToolStorage *data = storage.activeStorage();
data->name = clangToolName(input.tool);
data->executable = toolExecutable(input.tool);
if (!data->executable.isExecutableFile()) {
qWarning() << "Can't start:" << data->executable << "as" << data->name;
- return error;
+ return TaskAction::StopWithError;
}
QTC_CHECK(!input.unit.arguments.contains(QLatin1String("-o")));
QTC_CHECK(!input.unit.arguments.contains(input.unit.file));
- QTC_ASSERT(FilePath::fromString(input.unit.file).exists(), return error);
+ QTC_ASSERT(FilePath::fromString(input.unit.file).exists(), return TaskAction::StopWithError);
data->outputFilePath = createOutputFilePath(input.outputDirPath, input.unit.file);
- QTC_ASSERT(!data->outputFilePath.isEmpty(), return error);
+ QTC_ASSERT(!data->outputFilePath.isEmpty(), return TaskAction::StopWithError);
- return GroupConfig{GroupAction::ContinueAll};
+ return TaskAction::Continue;
};
const auto onProcessSetup = [=](QtcProcess &process) {
process.setEnvironment(input.environment);