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

Boot2Qt: Feed remote-qualified executable into ExecutableAspect

Browse Source 
Change-Id: I8a6d21147ef0df7a1e56fc2c125f687f05fef923
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-12-01 08:37:11 +01:00
parent 6c676636ba
commit 03525e7d3c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/boot2qt/qdbplugin.cpp
View File

@@ -121,10 +121,11 @@ public:
: SimpleTargetRunner(runControl) : SimpleTargetRunner(runControl)
{ {
setStartModifier([this] { setStartModifier([this] {
CommandLine plain = commandLine(); const CommandLine remoteCommand = commandLine();
CommandLine cmd; const FilePath remoteExe = remoteCommand.executable();
cmd.setExecutable(plain.executable().withNewPath(Constants::AppcontrollerFilepath)); CommandLine cmd{remoteExe.withNewPath(Constants::AppcontrollerFilepath)};
cmd.addCommandLineAsArgs(plain); cmd.addArg(remoteExe.nativePath());
cmd.addArgs(remoteCommand.arguments(), CommandLine::Raw);
setCommandLine(cmd); setCommandLine(cmd);
}); });
} }

8
src/plugins/boot2qt/qdbrunconfiguration.cpp
View File

@@ -8,6 +8,8 @@
#include <projectexplorer/buildsystem.h> #include <projectexplorer/buildsystem.h>
#include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/buildtargetinfo.h>
#include <projectexplorer/deploymentdata.h> #include <projectexplorer/deploymentdata.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
@@ -15,6 +17,7 @@
#include <remotelinux/remotelinuxenvironmentaspect.h> #include <remotelinux/remotelinuxenvironmentaspect.h>
#include <utils/commandline.h> #include <utils/commandline.h>
#include <utils/qtcassert.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -90,8 +93,9 @@ QdbRunConfiguration::QdbRunConfiguration(Target *target, Id id)
const BuildTargetInfo bti = buildTargetInfo(); const BuildTargetInfo bti = buildTargetInfo();
const FilePath localExecutable = bti.targetFilePath; const FilePath localExecutable = bti.targetFilePath;
const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable); const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable);
IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit());
exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath())); QTC_ASSERT(dev, return);
exeAspect->setExecutable(dev->filePath(depFile.remoteFilePath()));
symbolsAspect->setFilePath(localExecutable); symbolsAspect->setFilePath(localExecutable);
}); });