forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.10'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I7d9ecd6d8518699d848ac72a62e5c35c2cc2751f
This commit is contained in:
@@ -275,7 +275,7 @@ void LldbEngine::setupEngine()
|
||||
cmd2.arg("nativemixed", isNativeMixedActive());
|
||||
cmd2.arg("workingdirectory", rp.inferior.workingDirectory);
|
||||
cmd2.arg("environment", rp.inferior.environment.toStringList());
|
||||
cmd2.arg("processargs", toHex(rp.inferior.commandLineArguments));
|
||||
cmd2.arg("processargs", toHex(QtcProcess::splitArgs(rp.inferior.commandLineArguments).join(QChar(0))));
|
||||
|
||||
if (terminal()) {
|
||||
const qint64 attachedPID = terminal()->applicationPid();
|
||||
|
||||
Reference in New Issue
Block a user