aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-04-21 16:13:13 +0200
committercon <qtc-committer@nokia.com>2009-04-21 16:13:13 +0200
commit35218bbe20bafe22334a9b11ea01417cd078b887 (patch)
tree148d0db80d491990b3ce2cc15ae78032861c2850
parente0f7b845aa2a794a2f4d994d319f276deee7e134 (diff)
Add missing type information into gdb calls.v1.1.0
The missing type information lead to non-relocatable debugging helpers on the Mac. Reviewed-by: Oswald Buddenhagen
-rw-r--r--src/plugins/debugger/gdbengine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 2f28e095f3..0b53a37e3f 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -3145,7 +3145,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
sendWatchParameters(params);
QString cmd ="call "
- + QString("qDumpObjectData440(")
+ + QString("(void*)qDumpObjectData440(")
+ QString::number(protocol)
+ ',' + "%1+1" // placeholder for token
+ ',' + addr
@@ -3441,7 +3441,7 @@ void GdbEngine::sendWatchParameters(const QByteArray &params0)
QByteArray params = params0;
params.append('\0');
char buf[50];
- sprintf(buf, "set {char[%d]} qDumpInBuffer = {", params.size());
+ sprintf(buf, "set {char[%d]} &qDumpInBuffer = {", params.size());
QByteArray encoded;
encoded.append(buf);
for (int i = 0; i != params.size(); ++i) {
@@ -4179,14 +4179,14 @@ void GdbEngine::tryLoadDebuggingHelpers()
sendCommand("sharedlibrary " + dotEscape(lib));
#endif
// retreive list of dumpable classes
- sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
+ sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}
void GdbEngine::recheckDebuggingHelperAvailability()
{
// retreive list of dumpable classes
- sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
+ sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}