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

Dumper: optimize cdb Qt version detection

Browse Source 
... by not overwriting DumperBase.qtVersion. This function already
checks whether the Qt version was passed via the fetch variables
command.

amends 3aee50f5fd

Fixes: QTCREATORBUG-31049
Change-Id: Ifa67be5701fc7e5492e4c1fcb8943111b299c78d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2024-06-13 09:30:32 +02:00
parent 52a8aa7d09
commit bb4c6d2bff
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/debugger/cdbbridge.py
View File

@@ -331,8 +331,7 @@ class Dumper(DumperBase):
self.qtNamespace = lambda: namespace self.qtNamespace = lambda: namespace
return namespace return namespace
def qtVersion(self): def extractQtVersion(self):
qtVersion = None
try: try:
qtVersion = self.parseAndEvaluate( qtVersion = self.parseAndEvaluate(
'((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer() '((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer()
@@ -344,10 +343,7 @@ class Dumper(DumperBase):
(major, minor, patch) = version.decode('latin1').split('.') (major, minor, patch) = version.decode('latin1').split('.')
qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch) qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
except: except:
pass return None
if qtVersion is None:
qtVersion = self.fallbackQtVersion
self.qtVersion = lambda: qtVersion
return qtVersion return qtVersion
def putVtableItem(self, address): def putVtableItem(self, address):