diff options
| author | hjk <qtc-committer@nokia.com> | 2009-02-17 17:38:24 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-02-17 17:38:24 +0100 |
| commit | 1afd270da250f59a893d36dc53124831bd63864d (patch) | |
| tree | 09c1c530110695763e6cceec6b5e1667dfdc6803 /src/plugins/debugger/gdbengine.cpp | |
| parent | 153766b956bbf5b61681bbae8d4aac3d9095cca6 (diff) | |
| download | qt-creator-1afd270da250f59a893d36dc53124831bd63864d.tar.gz | |
Fixes: debugger: move custom dumper initialization into the first
watch view update
Conflicts:
src/plugins/debugger/gdbengine.cpp
Diffstat (limited to 'src/plugins/debugger/gdbengine.cpp')
| -rw-r--r-- | src/plugins/debugger/gdbengine.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 66c9efb887..9e818be0d1 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -3590,6 +3590,7 @@ void GdbEngine::updateLocals() setTokenBarrier(); m_pendingRequests = 0; + PENDING_DEBUG("\nRESET PENDING"); m_toolTipCache.clear(); m_toolTipExpression.clear(); @@ -3601,6 +3602,8 @@ void GdbEngine::updateLocals() sendSynchronizedCommand(cmd, StackListArguments); // stage 1/2 // '2' is 'list with type and value' sendSynchronizedCommand("-stack-list-locals 2", StackListLocals); // stage 2/2 + + tryLoadCustomDumpers(); } void GdbEngine::handleStackListArguments(const GdbResultRecord &record) @@ -3982,9 +3985,9 @@ void GdbEngine::tryLoadCustomDumpers() //if (qq->useFastStart()) // sendCommand("set stop-on-solib-events 0"); QString flag = QString::number(RTLD_NOW); - sendSynchronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")", + sendSyncronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")", WatchDumpCustomSetup); - sendSynchronizedCommand("sharedlibrary " + dotEscape(lib)); + sendSyncronizedCommand("sharedlibrary " + dotEscape(lib)); //if (qq->useFastStart()) // sendCommand("set stop-on-solib-events 1"); } else { @@ -3999,9 +4002,9 @@ void GdbEngine::tryLoadCustomDumpers() // sendCommand("set stop-on-solib-events 0"); //sendCommand("handle SIGSEGV pass stop print"); //sendCommand("set unwindonsignal off"); - sendSynchronizedCommand("call LoadLibraryA(\"" + lib + "\")", + sendSyncronizedCommand("call LoadLibraryA(\"" + lib + "\")", WatchDumpCustomSetup); - sendSynchronizedCommand("sharedlibrary " + dotEscape(lib)); + sendSyncronizedCommand("sharedlibrary " + dotEscape(lib)); //if (qq->useFastStart()) // sendCommand("set stop-on-solib-events 1"); } else { |
