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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
This commit is contained in:
Eike Ziller
2022-07-20 11:53:36 +02:00
parent 034acdeeb2 e1b0ba2473
commit 3ec87e37ee
77 changed files with 917 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/debuggerengine.cpp
View File

@@ -1058,10 +1058,12 @@ void DebuggerEngine::setRunId(const QString &id)
void DebuggerEngine::setRunTool(DebuggerRunTool *runTool)
{
d->m_device = runTool->device();
QTC_ASSERT(d->m_device, d->m_device = DeviceManager::deviceForPath(
d->m_runParameters.inferior.command.executable()));
if (QTC_GUARD(d->m_device))
d->m_runParameters.dumperPath = d->m_device->debugDumperPath();
IDevice::ConstPtr debuggerDevice =
DeviceManager::deviceForPath(d->m_runParameters.debugger.command.executable());
if (QTC_GUARD(debuggerDevice))
d->m_runParameters.dumperPath = debuggerDevice->debugDumperPath();
d->m_terminalRunner = runTool->terminalRunner();
validateRunParameters(d->m_runParameters);