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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: If8baed5564470e550a0ba5c7720915217eec2412
This commit is contained in:
Eike Ziller
2021-10-21 09:13:03 +02:00
parent f41bebc843 5377253612
commit bb9774de92
459 changed files with 9236 additions and 6091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3800,8 +3800,11 @@ static SourcePathMap mergeStartParametersSourcePathMap(const DebuggerRunParamete
{
// Do not overwrite user settings.
SourcePathMap rc = sp.sourcePathMap;
for (auto it = in.constBegin(), end = in.constEnd(); it != end; ++it)
rc.insert(it.key(), it.value());
for (auto it = in.constBegin(), end = in.constEnd(); it != end; ++it) {
// Entries that start with parenthesis are handled in CppDebuggerEngine::validateRunParameters
if (!it.key().startsWith('('))
rc.insert(it.key(), sp.macroExpander->expand(it.value()));
}
return rc;
}
@@ -3850,6 +3853,7 @@ void GdbEngine::setupEngine()
gdbCommand.addArg("-n");
Environment gdbEnv = rp.debugger.environment;
gdbEnv.setupEnglishOutput();
if (rp.runAsRoot) {
CommandLine wrapped("sudo", {"-A"});
wrapped.addCommandLineAsArgs(gdbCommand);