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

remotelinux: remove line noise

Browse Source 
Change-Id: I5878f69257dd396e52c2835413d7045ed5c71f02
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-27 15:58:47 +02:00
parent ec06d3f1af
commit 27fbe170d4
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public:
{ {
} }
const QPointer<Debugger::DebuggerEngine> engine; const QPointer<DebuggerEngine> engine;
bool qmlDebugging; bool qmlDebugging;
bool cppDebugging; bool cppDebugging;
QByteArray gdbserverOutput; QByteArray gdbserverOutput;
@@ -98,7 +98,7 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
{ {
DebuggerStartParameters params; DebuggerStartParameters params;
const LinuxDeviceConfiguration::ConstPtr devConf const LinuxDeviceConfiguration::ConstPtr devConf
= ProjectExplorer::DeviceProfileInformation::device(runConfig->target()->profile()) = DeviceProfileInformation::device(runConfig->target()->profile())
.dynamicCast<const RemoteLinux::LinuxDeviceConfiguration>(); .dynamicCast<const RemoteLinux::LinuxDeviceConfiguration>();
if (runConfig->debuggerAspect()->useQmlDebugger()) { if (runConfig->debuggerAspect()->useQmlDebugger()) {
params.languages |= QmlLanguage; params.languages |= QmlLanguage;
@@ -109,21 +109,21 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
params.languages |= CppLanguage; params.languages |= CppLanguage;
params.processArgs = runConfig->arguments(); params.processArgs = runConfig->arguments();
QString systemRoot; QString systemRoot;
if (ProjectExplorer::SysRootProfileInformation::hasSysRoot(runConfig->target()->profile())) if (SysRootProfileInformation::hasSysRoot(runConfig->target()->profile()))
systemRoot = ProjectExplorer::SysRootProfileInformation::sysRoot(runConfig->target()->profile()).toString(); systemRoot = SysRootProfileInformation::sysRoot(runConfig->target()->profile()).toString();
params.sysroot = systemRoot; params.sysroot = systemRoot;
params.toolChainAbi = runConfig->abi(); params.toolChainAbi = runConfig->abi();
params.startMode = AttachToRemoteServer; params.startMode = AttachToRemoteServer;
params.executable = runConfig->localExecutableFilePath(); params.executable = runConfig->localExecutableFilePath();
params.debuggerCommand = Debugger::DebuggerProfileInformation::debuggerCommand(runConfig->target()->profile()).toString(); params.debuggerCommand = DebuggerProfileInformation::debuggerCommand(runConfig->target()->profile()).toString();
params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1"); params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1");
// TODO: This functionality should be inside the debugger. // TODO: This functionality should be inside the debugger.
ToolChain *tc = ToolChainProfileInformation::toolChain(runConfig->target()->profile()); ToolChain *tc = ToolChainProfileInformation::toolChain(runConfig->target()->profile());
if (tc) { if (tc) {
const ProjectExplorer::Abi &abi = tc->targetAbi(); const Abi &abi = tc->targetAbi();
params.remoteArchitecture = abi.toString(); params.remoteArchitecture = abi.toString();
params.gnuTarget = QLatin1String(abi.architecture() == ProjectExplorer::Abi::ArmArchitecture params.gnuTarget = QLatin1String(abi.architecture() == Abi::ArmArchitecture
? "arm-none-linux-gnueabi": "i386-unknown-linux-gnu"); ? "arm-none-linux-gnueabi": "i386-unknown-linux-gnu");
} }
} else { } else {
@@ -132,11 +132,10 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
params.remoteSetupNeeded = true; params.remoteSetupNeeded = true;
params.displayName = runConfig->displayName(); params.displayName = runConfig->displayName();
if (const ProjectExplorer::Project *project = runConfig->target()->project()) { if (const Project *project = runConfig->target()->project()) {
params.projectSourceDirectory = project->projectDirectory(); params.projectSourceDirectory = project->projectDirectory();
if (const ProjectExplorer::BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration()) { if (const BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration())
params.projectBuildDirectory = buildConfig->buildDirectory(); params.projectBuildDirectory = buildConfig->buildDirectory();
}
params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles); params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles);
} }