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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppeditorwidget.cpp

Change-Id: I618826eaea8acfa65148bd191a0263454bf50e43
This commit is contained in:
Eike Ziller
2023-11-27 11:47:53 +01:00
parent b76c054961 d7545f9bf5
commit f9fb628ee3
8 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -266,7 +266,13 @@ void LldbEngine::handleLldbStarted()
cmd2.arg("startmode", rp.startMode);
cmd2.arg("nativemixed", isNativeMixedActive());
cmd2.arg("workingdirectory", rp.inferior.workingDirectory.path());
cmd2.arg("environment", rp.inferior.environment.toStringList());
QStringList environment = rp.inferior.environment.toStringList();
// Prevent lldb from automatically setting OS_ACTIVITY_DT_MODE to mirror
// NSLog to stderr, as that will also mirror os_log, which we pick up in
// AppleUnifiedLogger::preventsStderrLogging(), and end up disabling Qt's
// default stderr logger. We prefer Qt's own stderr logging if we can.
environment << "IDE_DISABLED_OS_ACTIVITY_DT_MODE=1";
cmd2.arg("environment", environment);
cmd2.arg("processargs", toHex(ProcessArgs::splitArgs(rp.inferior.command.arguments(),
HostOsInfo::hostOs()).join(QChar(0))));
cmd2.arg("platform", rp.platform);