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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmaketool.cpp
	src/plugins/python/pythonutils.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Ia3e35c763ff9475d17ad922718b54152209893b8
This commit is contained in:
Eike Ziller
2024-03-14 11:35:07 +01:00
parent 685f452d91 11752615c5
commit c19f97bd23
97 changed files with 699 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1438,6 +1438,9 @@ void DebuggerEnginePrivate::updateState()
return;
QTC_ASSERT(m_threadLabel, return);
if (m_isDying)
return;
const DebuggerState state = m_state;
const bool companionPreventsAction = m_engine->companionPreventsActions();
@@ -1762,6 +1765,10 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
d->m_logWindow->showInput(LogInput, msg);
d->m_logWindow->showOutput(LogInput, msg);
break;
case LogOutput:
case LogWarning:
d->m_logWindow->showOutput(channel, msg);
break;
case LogError:
d->m_logWindow->showInput(LogError, "ERROR: " + msg);
d->m_logWindow->showOutput(LogError, "ERROR: " + msg);
@@ -1776,7 +1783,7 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
emit appendMessageRequested(msg, StdErrFormat, false);
break;
default:
d->m_logWindow->showOutput(channel, msg);
d->m_logWindow->showOutput(channel, QString("[%1] %2").arg(debuggerName(), msg));
break;
}
}
@@ -1794,6 +1801,9 @@ void DebuggerEngine::notifyDebuggerProcessFinished(const ProcessResultData &resu
case DebuggerFinished:
// Nothing to do.
break;
case EngineSetupRequested:
notifyEngineSetupFailed();
break;
case EngineShutdownRequested:
case InferiorShutdownRequested:
notifyEngineShutdownFinished();
@@ -2011,11 +2021,16 @@ void DebuggerEngine::quitDebugger()
case EngineShutdownRequested:
case InferiorShutdownRequested:
break;
case EngineRunFailed:
case DebuggerFinished:
case DebuggerNotReady:
case EngineSetupFailed:
case InferiorShutdownFinished:
case EngineRunFailed:
case EngineShutdownFinished:
case DebuggerFinished:
break;
default:
case InferiorRunRequested:
case InferiorRunFailed:
case InferiorStopRequested:
// FIXME: We should disable the actions connected to that.
notifyInferiorIll();
break;