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

Debugger: Fix attaching to running process with cdb

Browse Source 
Do not add inferior command line arguments to the cdb process if we are
attaching to an already running process.

Task-number: QTCREATORBUG-19034
Change-Id: I7b9a98b790e819fc76ff4ec75769785741bfde83
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2017-10-16 13:18:44 +02:00
parent eb5b45aa6c
commit b248953247
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -476,6 +476,11 @@ void CdbEngine::setupEngine()
nativeArguments.push_back(blank); nativeArguments.push_back(blank);
QtcProcess::addArgs(&nativeArguments, QtcProcess::addArgs(&nativeArguments,
QStringList(QDir::toNativeSeparators(sp.inferior.executable))); QStringList(QDir::toNativeSeparators(sp.inferior.executable)));
if (!sp.inferior.commandLineArguments.isEmpty()) { // Complete native argument string.
if (!nativeArguments.isEmpty())
nativeArguments.push_back(blank);
nativeArguments += sp.inferior.commandLineArguments;
}
break; break;
case AttachToRemoteServer: case AttachToRemoteServer:
break; break;
@@ -496,11 +501,6 @@ void CdbEngine::setupEngine()
handleSetupFailure(QString("Internal error: Unsupported start mode %1.").arg(sp.startMode)); handleSetupFailure(QString("Internal error: Unsupported start mode %1.").arg(sp.startMode));
return; return;
} }
if (!sp.inferior.commandLineArguments.isEmpty()) { // Complete native argument string.
if (!nativeArguments.isEmpty())
nativeArguments.push_back(blank);
nativeArguments += sp.inferior.commandLineArguments;
}
const QString msg = QString("Launching %1 %2\nusing %3 of %4."). const QString msg = QString("Launching %1 %2\nusing %3 of %4.").
arg(QDir::toNativeSeparators(executable), arg(QDir::toNativeSeparators(executable),