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

Boot2Qt: Inline QdbDeviceRunSupport

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I4b2bcc5901fbe84ab3e39d3acfe14459f4f71c99
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-11-20 16:07:35 +01:00
parent fc35bab3af
commit 45a5ab8552
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/boot2qt/qdbdevicedebugsupport.cpp
View File

@@ -110,26 +110,6 @@ private:
Process m_launcher; Process m_launcher;
}; };
// QdbDeviceRunSupport
class QdbDeviceRunSupport : public SimpleTargetRunner
{
public:
QdbDeviceRunSupport(RunControl *runControl)
: SimpleTargetRunner(runControl)
{
setStartModifier([this] {
const CommandLine remoteCommand = commandLine();
const FilePath remoteExe = remoteCommand.executable();
CommandLine cmd{remoteExe.withNewPath(Constants::AppcontrollerFilepath)};
cmd.addArg(remoteExe.nativePath());
cmd.addArgs(remoteCommand.arguments(), CommandLine::Raw);
setCommandLine(cmd);
});
}
};
// QdbDeviceDebugSupport // QdbDeviceDebugSupport
class QdbDeviceDebugSupport final : public Debugger::DebuggerRunTool class QdbDeviceDebugSupport final : public Debugger::DebuggerRunTool
@@ -230,7 +210,18 @@ class QdbRunWorkerFactory final : public RunWorkerFactory
public: public:
QdbRunWorkerFactory() QdbRunWorkerFactory()
{ {
setProduct<QdbDeviceRunSupport>(); setProducer([](RunControl *runControl) {
auto worker = new SimpleTargetRunner(runControl);
worker->setStartModifier([worker] {
const CommandLine remoteCommand = worker->commandLine();
const FilePath remoteExe = remoteCommand.executable();
CommandLine cmd{remoteExe.withNewPath(Constants::AppcontrollerFilepath)};
cmd.addArg(remoteExe.nativePath());
cmd.addArgs(remoteCommand.arguments(), CommandLine::Raw);
worker->setCommandLine(cmd);
});
return worker;
});
addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE); addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
addSupportedRunConfig(Constants::QdbRunConfigurationId); addSupportedRunConfig(Constants::QdbRunConfigurationId);
addSupportedRunConfig(QmlProjectManager::Constants::QML_RUNCONFIG_ID); addSupportedRunConfig(QmlProjectManager::Constants::QML_RUNCONFIG_ID);