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

QdbStopApplicationService: Replace DynamicSetup with dynamic task setup

Browse Source 
Change-Id: I5c02ea111afe604c61f11ff7a4677c825743ed80
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-01-20 10:11:02 +01:00
parent 6bcee998a5
commit a37f2ae3a8
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/boot2qt/qdbstopapplicationstep.cpp
View File

@@ -35,6 +35,10 @@ Group QdbStopApplicationService::deployRecipe()
{ {
const auto setupHandler = [this](QtcProcess &process) { const auto setupHandler = [this](QtcProcess &process) {
const auto device = DeviceKitAspect::device(target()->kit()); const auto device = DeviceKitAspect::device(target()->kit());
if (!device) {
emit errorMessage(Tr::tr("No device to stop the application on."));
return TaskAction::StopWithError;
}
QTC_CHECK(device); QTC_CHECK(device);
process.setCommand({device->filePath(Constants::AppcontrollerFilepath), {"--stop"}}); process.setCommand({device->filePath(Constants::AppcontrollerFilepath), {"--stop"}});
process.setWorkingDirectory("/usr/bin"); process.setWorkingDirectory("/usr/bin");
@@ -42,6 +46,7 @@ Group QdbStopApplicationService::deployRecipe()
connect(proc, &QtcProcess::readyReadStandardOutput, this, [this, proc] { connect(proc, &QtcProcess::readyReadStandardOutput, this, [this, proc] {
emit stdOutData(proc->readAllStandardOutput()); emit stdOutData(proc->readAllStandardOutput());
}); });
return TaskAction::Continue;
}; };
const auto doneHandler = [this](const QtcProcess &) { const auto doneHandler = [this](const QtcProcess &) {
emit progressMessage(Tr::tr("Stopped the running application.")); emit progressMessage(Tr::tr("Stopped the running application."));
@@ -60,19 +65,7 @@ Group QdbStopApplicationService::deployRecipe()
emit errorMessage(failureMessage); emit errorMessage(failureMessage);
} }
}; };
const auto rootSetupHandler = [this] { return Group { Process(setupHandler, doneHandler, errorHandler) };
const auto device = DeviceKitAspect::device(target()->kit());
if (!device) {
emit errorMessage(Tr::tr("No device to stop the application on."));
return GroupConfig{GroupAction::StopWithError};
}
return GroupConfig();
};
const Group root {
DynamicSetup(rootSetupHandler),
Process(setupHandler, doneHandler, errorHandler)
};
return root;
} }
// QdbStopApplicationStep // QdbStopApplicationStep