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

Demote debuggerrunconfigurationaspect

Browse Source 
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-03-26 17:03:57 +01:00
parent 21da8c641d
commit e474b6ed8f
22 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -61,8 +61,8 @@ public:
LinuxDeviceDebugSupportPrivate(const RemoteLinuxRunConfiguration *runConfig,
DebuggerEngine *engine)
: engine(engine),
qmlDebugging(runConfig->debuggerAspect()->useQmlDebugger()),
cppDebugging(runConfig->debuggerAspect()->useCppDebugger()),
qmlDebugging(runConfig->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>()->useQmlDebugger()),
cppDebugging(runConfig->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>()->useCppDebugger()),
state(Inactive),
gdbServerPort(-1), qmlPort(-1),
device(DeviceKitInformation::device(runConfig->target()->kit())),
@@ -105,12 +105,14 @@ DebuggerStartParameters LinuxDeviceDebugSupport::startParameters(const RemoteLin
if (ToolChain *tc = ToolChainKitInformation::toolChain(k))
params.toolChainAbi = tc->targetAbi();
if (runConfig->debuggerAspect()->useQmlDebugger()) {
ProjectExplorer::DebuggerRunConfigurationAspect *aspect
= runConfig->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
if (aspect->useQmlDebugger()) {
params.languages |= QmlLanguage;
params.qmlServerAddress = device->sshParameters().host;
params.qmlServerPort = 0; // port is selected later on
}
if (runConfig->debuggerAspect()->useCppDebugger()) {
if (aspect->useCppDebugger()) {
params.languages |= CppLanguage;
params.processArgs = runConfig->arguments();
params.startMode = AttachToRemoteServer;