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

Debugger: Add debugger name to progress bar

Browse Source 
... when there is more than one engine.

Mildly-related-to: QTCREATORBUG-30355
Change-Id: Idaf41b97f51c384ccf6a437d9c9c8dec922affc6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2024-06-06 14:24:57 +02:00
parent 6040fef260
commit acd3d60fb2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,8 +553,10 @@ void DebuggerEnginePrivate::setupViews()
= new Perspective(perspectiveId, m_engine->displayName(), parentPerspectiveId, settingsId); = new Perspective(perspectiveId, m_engine->displayName(), parentPerspectiveId, settingsId);
m_progress.setProgressRange(0, 1000); m_progress.setProgressRange(0, 1000);
FutureProgress *fp = ProgressManager::addTask(m_progress.future(), const QString msg = m_companionEngines.isEmpty()
Tr::tr("Launching Debugger"), "Debugger.Launcher"); ? Tr::tr("Launching Debugger")
: Tr::tr("Launching %1 Debugger").arg(m_debuggerName);
FutureProgress *fp = ProgressManager::addTask(m_progress.future(), msg, "Debugger.Launcher");
connect(fp, &FutureProgress::canceled, m_engine, &DebuggerEngine::quitDebugger); connect(fp, &FutureProgress::canceled, m_engine, &DebuggerEngine::quitDebugger);
m_progress.reportStarted(); m_progress.reportStarted();

2
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -543,11 +543,11 @@ void DebuggerRunTool::start()
for (auto engine : m_engines) { for (auto engine : m_engines) {
engine->setRunParameters(m_runParameters); engine->setRunParameters(m_runParameters);
engine->setRunId(d->runId); engine->setRunId(d->runId);
engine->setRunTool(this);
for (auto companion : m_engines) { for (auto companion : m_engines) {
if (companion != engine) if (companion != engine)
engine->addCompanionEngine(companion); engine->addCompanionEngine(companion);
} }
engine->setRunTool(this);
if (!first) if (!first)
engine->setSecondaryEngine(); engine->setSecondaryEngine();
auto rc = runControl(); auto rc = runControl();