diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch index 00473f3458d78cb11acb2bb75d02aee69b0869d7..c728e43245e3171093ce06f07e4e393d6fb157d4 100644 Binary files a/doc/qtcreator.qch and b/doc/qtcreator.qch differ diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 5fce8a9655561704cc99737f24d145afe18863cd..aea9635048f9711418da8d97a98f6b2c5a6fa6f4 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -442,7 +442,8 @@ void GdbEngine::handleResponse() break; } - if (token == -1 && *from != '&' && *from != '~' && *from != '*') { + if (token == -1 && *from != '&' && *from != '~' && *from != '*' + && *from != '=') { // FIXME: On Linux the application's std::out is merged in here. // High risk of falsely interpreting this as MI output. // We assume that we _always_ use tokens, so not finding a token @@ -470,7 +471,7 @@ void GdbEngine::handleResponse() for (; from != to; ++from) { const char c = *from; if (!isNameChar(c)) - break; + break; asyncClass += *from; } //qDebug() << "ASYNCCLASS" << asyncClass; @@ -1283,7 +1284,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data) QVariant var = QVariant::fromValue<GdbMi>(data); sendCommand("p 0", GdbAsyncOutput2, var); // dummy } else { - q->showStatusMessage(tr("Stopped. Reason: \"%1\"").arg(reason)); + q->showStatusMessage(tr("Stopped: \"%1\"").arg(reason)); handleAsyncOutput2(data); } return;