Merge remote-tracking branch 'origin/5.0'

Change-Id: I7ca9791b95032a1f276c520f8eefde3801510eb9
This commit is contained in:
Orgad Shaneh
2021-09-24 17:01:29 +03:00
51 changed files with 1101 additions and 457 deletions

View File

@@ -4469,10 +4469,16 @@ void GdbEngine::setupInferior()
? QString("Going to attach to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID)
: QString("Going to attach to %1").arg(attachedPID);
showMessage(msg, LogMisc);
const QString executable
= runParameters().inferior.command.executable().toFileInfo().absoluteFilePath();
runCommand({"-file-exec-and-symbols \"" + executable + '"',
CB(handleFileExecAndSymbols)});
// For some reason, this breaks GDB 9 on Linux. See QTCREATORBUG-26299.
if (HostOsInfo::isWindowsHost() && m_gdbVersion >= 100000) {
// Required for debugging MinGW32 apps with 64-bit GDB. See QTCREATORBUG-26208.
const QString executable
= runParameters().inferior.command.executable().toFileInfo().absoluteFilePath();
runCommand({"-file-exec-and-symbols \"" + executable + '"',
CB(handleFileExecAndSymbols)});
} else {
handleInferiorPrepared();
}
} else if (isPlainEngine()) {
setEnvironmentVariables();