forked from qt-creator/qt-creator
debugger: fix color of launching progress bar in case of failure
This commit is contained in:
@@ -1580,8 +1580,11 @@ QString GdbEngine::cleanupFullName(const QString &fileName)
|
|||||||
void GdbEngine::shutdown()
|
void GdbEngine::shutdown()
|
||||||
{
|
{
|
||||||
debugMessage(_("INITIATE GDBENGINE SHUTDOWN"));
|
debugMessage(_("INITIATE GDBENGINE SHUTDOWN"));
|
||||||
if (m_progress)
|
if (m_progress) {
|
||||||
|
m_progress->setProgressValue(90);
|
||||||
m_progress->reportCanceled();
|
m_progress->reportCanceled();
|
||||||
|
m_progress->reportFinished();
|
||||||
|
}
|
||||||
switch (state()) {
|
switch (state()) {
|
||||||
case DebuggerNotReady: // Nothing to do! :)
|
case DebuggerNotReady: // Nothing to do! :)
|
||||||
case EngineStarting: // We can't get here, really
|
case EngineStarting: // We can't get here, really
|
||||||
@@ -2067,10 +2070,8 @@ void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt
|
|||||||
QString name;
|
QString name;
|
||||||
if (!fullName.isEmpty()) {
|
if (!fullName.isEmpty()) {
|
||||||
name = cleanupFullName(QFile::decodeName(fullName));
|
name = cleanupFullName(QFile::decodeName(fullName));
|
||||||
if (data->markerFileName().isEmpty()) {
|
if (data->markerFileName().isEmpty())
|
||||||
qDebug() << "222" << name;
|
|
||||||
data->setMarkerFileName(name);
|
data->setMarkerFileName(name);
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
name = QFile::decodeName(file);
|
name = QFile::decodeName(file);
|
||||||
// Use fullName() once we have a mapping which is more complete than
|
// Use fullName() once we have a mapping which is more complete than
|
||||||
@@ -4199,8 +4200,6 @@ void GdbEngine::handleGdbFinished(int code, QProcess::ExitStatus type)
|
|||||||
|
|
||||||
void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &settingsIdHint)
|
void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &settingsIdHint)
|
||||||
{
|
{
|
||||||
if (m_progress)
|
|
||||||
m_progress->setProgressValue(30);
|
|
||||||
setState(AdapterStartFailed);
|
setState(AdapterStartFailed);
|
||||||
debugMessage(_("ADAPTER START FAILED"));
|
debugMessage(_("ADAPTER START FAILED"));
|
||||||
if (!msg.isEmpty()) {
|
if (!msg.isEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user