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

Debugger: Fix triggering display of threadnames

Browse Source 
This is a recent regression introduced by the delayed python dumper
initialization.

Task-number: QTCREATORBUG-8615
Change-Id: I3b5dbe5b04c68cf873e3a2597edc60fe2888b3c9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2013-01-31 16:04:04 +01:00
committed by Orgad Shaneh
parent 58c45ca766
commit 4622aba79e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1841,6 +1841,14 @@ void GdbEngine::handleListFeatures(const GdbResponse &response)
} }
void GdbEngine::handleHasPython(const GdbResponse &response) void GdbEngine::handleHasPython(const GdbResponse &response)
{
if (response.resultClass == GdbResultDone)
m_hasPython = true;
else
pythonDumpersFailed();
}
void GdbEngine::handlePythonSetup(const GdbResponse &response)
{ {
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
m_hasPython = true; m_hasPython = true;
@@ -1863,8 +1871,6 @@ void GdbEngine::handleHasPython(const GdbResponse &response)
} }
const GdbMi hasInferiorThreadList = data.findChild("hasInferiorThreadList"); const GdbMi hasInferiorThreadList = data.findChild("hasInferiorThreadList");
m_hasInferiorThreadList = (hasInferiorThreadList.data().toInt() != 0); m_hasInferiorThreadList = (hasInferiorThreadList.data().toInt() != 0);
} else {
pythonDumpersFailed();
} }
} }
@@ -4924,7 +4930,7 @@ void GdbEngine::tryLoadPythonDumpers()
loadInitScript(); loadInitScript();
postCommand("bbsetup", ConsoleCommand); postCommand("bbsetup", ConsoleCommand, CB(handlePythonSetup));
} }
void GdbEngine::reloadDebuggingHelpers() void GdbEngine::reloadDebuggingHelpers()

1
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -391,6 +391,7 @@ protected:
void handleShowVersion(const GdbResponse &response); void handleShowVersion(const GdbResponse &response);
void handleListFeatures(const GdbResponse &response); void handleListFeatures(const GdbResponse &response);
void handleHasPython(const GdbResponse &response); void handleHasPython(const GdbResponse &response);
void handlePythonSetup(const GdbResponse &response);
int m_gdbVersion; // 6.8.0 is 60800 int m_gdbVersion; // 6.8.0 is 60800
int m_gdbBuildVersion; // MAC only? int m_gdbBuildVersion; // MAC only?