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:
Eike Ziller
2019-08-07 08:09:45 +02:00
15 changed files with 58 additions and 54 deletions

View File

@@ -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();