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

Debugger: Remove last user of setRunParameters()

Browse Source 
Change-Id: I0480c1f8532d3d9dfdfe277d4bcadc171a11d38c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-12 14:17:47 +02:00
parent fb9c5e59ed
commit 3d8ddb389d
1 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1146,63 +1146,73 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
*errorMessage = msgParameterMissing(*it); *errorMessage = msgParameterMissing(*it);
return false; return false;
} }
Kit *kit = 0; const qulonglong pid = it->toULongLong();
DebuggerRunParameters rp; const QStringList args = it->split(',');
qulonglong pid = it->toULongLong();
if (pid) { Kit *kit = nullptr;
rp.startMode = AttachExternal; DebuggerStartMode startMode = StartExternal;
rp.closeMode = DetachAtClose; QString executable;
rp.attachPID = ProcessHandle(pid); QString remoteChannel;
rp.displayName = tr("Process %1").arg(rp.attachPID.pid()); QString coreFile;
rp.startMessage = tr("Attaching to local process %1.").arg(rp.attachPID.pid()); bool useTerminal = false;
} else {
rp.startMode = StartExternal; if (!pid) {
QStringList args = it->split(QLatin1Char(','));
foreach (const QString &arg, args) { foreach (const QString &arg, args) {
QString key = arg.section(QLatin1Char('='), 0, 0); const QString key = arg.section('=', 0, 0);
QString val = arg.section(QLatin1Char('='), 1, 1); const QString val = arg.section('=', 1, 1);
if (val.isEmpty()) { if (val.isEmpty()) {
if (key.isEmpty()) { if (key.isEmpty()) {
continue; continue;
} else if (rp.inferior.executable.isEmpty()) { } else if (executable.isEmpty()) {
rp.inferior.executable = key; executable = key;
} else { } else {
*errorMessage = DebuggerPlugin::tr("Only one executable allowed."); *errorMessage = DebuggerPlugin::tr("Only one executable allowed.");
return false; return false;
} }
} } else if (key == "kit") {
if (key == QLatin1String("server")) {
rp.startMode = AttachToRemoteServer;
rp.remoteChannel = val;
rp.displayName = tr("Remote: \"%1\"").arg(rp.remoteChannel);
rp.startMessage = tr("Attaching to remote server %1.").arg(rp.remoteChannel);
} else if (key == QLatin1String("core")) {
rp.startMode = AttachCore;
rp.closeMode = DetachAtClose;
rp.coreFile = val;
rp.displayName = tr("Core file \"%1\"").arg(rp.coreFile);
rp.startMessage = tr("Attaching to core file %1.").arg(rp.coreFile);
} else if (key == QLatin1String("terminal")) {
rp.useTerminal = bool(val.toInt());
} else if (key == QLatin1String("kit")) {
kit = KitManager::kit(Id::fromString(val)); kit = KitManager::kit(Id::fromString(val));
} else if (key == "server") {
startMode = AttachToRemoteServer;
remoteChannel = remoteChannel;
} else if (key == "core") {
startMode = AttachCore;
coreFile = val;
} else if (key == "terminal") {
useTerminal = true;
} }
} }
} }
if (rp.startMode == StartExternal) {
rp.displayName = tr("Executable file \"%1\"").arg(rp.inferior.executable);
rp.startMessage = tr("Debugging file %1.").arg(rp.inferior.executable);
}
rp.inferior.environment = Utils::Environment::systemEnvironment();
rp.stubEnvironment = Utils::Environment::systemEnvironment();
rp.debugger.environment = Utils::Environment::systemEnvironment();
if (!kit) if (!kit)
kit = guessKitFromAbis(Abi::abisOfBinary(FileName::fromString(rp.inferior.executable))); kit = guessKitFromAbis(Abi::abisOfBinary(FileName::fromString(executable)));
auto debugger = DebuggerRunTool::createFromKit(kit); auto debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return false); QTC_ASSERT(debugger, return false);
debugger->setRunParameters(rp);
if (pid) {
debugger->setStartMode(AttachExternal);
debugger->setCloseMode(DetachAtClose);
debugger->setAttachPid(pid);
debugger->setRunControlName(tr("Process %1").arg(pid));
debugger->setStartMessage(tr("Attaching to local process %1.").arg(pid));
} else if (startMode == AttachToRemoteServer) {
debugger->setStartMode(AttachToRemoteServer);
debugger->setRemoteChannel(remoteChannel);
debugger->setRunControlName(tr("Remote: \"%1\"").arg(remoteChannel));
debugger->setStartMessage(tr("Attaching to remote server %1.").arg(remoteChannel));
} else if (startMode == AttachCore) {
debugger->setStartMode(AttachCore);
debugger->setCloseMode(DetachAtClose);
debugger->setCoreFileName(coreFile);
debugger->setRunControlName(tr("Core file \"%1\"").arg(coreFile));
debugger->setStartMessage(tr("Attaching to core file %1.").arg(coreFile));
} else {
debugger->setStartMode(StartExternal);
debugger->setInferiorExecutable(executable);
debugger->setRunControlName(tr("Executable file \"%1\"").arg(executable));
debugger->setStartMessage(tr("Debugging file %1.").arg(executable));
}
debugger->setUseTerminal(useTerminal);
m_scheduledStarts.append(debugger); m_scheduledStarts.append(debugger);
return true; return true;
} }