forked from qt-creator/qt-creator
Debugger: do not overwrite qtNamespace in the cdbbridge
Change-Id: I11a95710867fd0a6b5a2956a9f8f4a86932038dd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -314,25 +314,6 @@ class Dumper(DumperBase):
|
|||||||
self.qtDeclarativeHookDataSymbolName = lambda: hookSymbolName
|
self.qtDeclarativeHookDataSymbolName = lambda: hookSymbolName
|
||||||
return hookSymbolName
|
return hookSymbolName
|
||||||
|
|
||||||
def qtNamespace(self):
|
|
||||||
namespace = ''
|
|
||||||
qstrdupSymbolName = '*qstrdup'
|
|
||||||
coreModuleName = self.qtCoreModuleName()
|
|
||||||
if coreModuleName is not None:
|
|
||||||
qstrdupSymbolName = '%s!%s' % (coreModuleName, qstrdupSymbolName)
|
|
||||||
resolved = cdbext.resolveSymbol(qstrdupSymbolName)
|
|
||||||
if resolved:
|
|
||||||
name = resolved[0].split('!')[1]
|
|
||||||
namespaceIndex = name.find('::')
|
|
||||||
if namespaceIndex > 0:
|
|
||||||
namespace = name[:namespaceIndex + 2]
|
|
||||||
self.qtNamespace = lambda: namespace
|
|
||||||
self.qtCustomEventFunc = self.parseAndEvaluate(
|
|
||||||
'%s!%sQObject::customEvent' %
|
|
||||||
(self.qtCoreModuleName(), namespace)).address()
|
|
||||||
self.qtNamespace = lambda: namespace
|
|
||||||
return namespace
|
|
||||||
|
|
||||||
def extractQtVersion(self):
|
def extractQtVersion(self):
|
||||||
try:
|
try:
|
||||||
qtVersion = self.parseAndEvaluate(
|
qtVersion = self.parseAndEvaluate(
|
||||||
@@ -924,3 +905,12 @@ class Dumper(DumperBase):
|
|||||||
if self.useDynamicType:
|
if self.useDynamicType:
|
||||||
val.typeid = self.dynamic_typeid_at_address(val.typeid, address)
|
val.typeid = self.dynamic_typeid_at_address(val.typeid, address)
|
||||||
return val
|
return val
|
||||||
|
|
||||||
|
def fetchInternalFunctions(self):
|
||||||
|
coreModuleName = self.qtCoreModuleName()
|
||||||
|
ns = self.qtNamespace()
|
||||||
|
if coreModuleName is not None:
|
||||||
|
self.qtCustomEventFunc = self.parseAndEvaluate(
|
||||||
|
'%s!%sQObject::customEvent' %
|
||||||
|
(self.qtCoreModuleName(), ns)).address()
|
||||||
|
self.fetchInternalFunctions = lambda: None
|
||||||
|
Reference in New Issue
Block a user