forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.4'
Conflicts: src/tools/clangbackend/ipcsource/clangiasyncjob.cpp src/tools/clangbackend/ipcsource/clangjobrequest.cpp src/tools/clangbackend/ipcsource/clangjobrequest.h Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
This commit is contained in:
@@ -741,7 +741,7 @@ class Dumper(DumperBase):
|
||||
typeName = "'" + typeName + "'"
|
||||
# 'class' is needed, see http://sourceware.org/bugzilla/show_bug.cgi?id=11912
|
||||
#exp = '((class %s*)%s)->%s(%s)' % (typeName, value.laddress, function, arg)
|
||||
addr = value.laddress
|
||||
addr = value.address()
|
||||
if addr is None:
|
||||
addr = self.pokeValue(value)
|
||||
#warn('PTR: %s -> %s(%s)' % (value, function, addr))
|
||||
@@ -750,7 +750,7 @@ class Dumper(DumperBase):
|
||||
result = gdb.parse_and_eval(exp)
|
||||
#warn(' -> %s' % result)
|
||||
res = self.fromNativeValue(result)
|
||||
if value.laddress is None:
|
||||
if value.address() is None:
|
||||
self.releaseValue(addr)
|
||||
return res
|
||||
|
||||
@@ -1056,7 +1056,7 @@ class Dumper(DumperBase):
|
||||
typeName = typeName[0:pos]
|
||||
if typeName in self.qqEditable and not simpleType:
|
||||
#self.qqEditable[typeName](self, expr, value)
|
||||
expr = gdb.parse_and_eval(expr)
|
||||
expr = self.parseAndEvaluate(expr)
|
||||
self.qqEditable[typeName](self, expr, value)
|
||||
else:
|
||||
cmd = 'set variable (%s)=%s' % (expr, value)
|
||||
|
||||
Reference in New Issue
Block a user