From bb4c6d2bff02e14a1b13498243e94f5c63679899 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 13 Jun 2024 09:30:32 +0200
Subject: [PATCH] Dumper: optimize cdb Qt version detection

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

amends 3aee50f5fd9ebd46c70bed9b0e7343f90afb6603

Fixes: QTCREATORBUG-31049
Change-Id: Ifa67be5701fc7e5492e4c1fcb8943111b299c78d
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/debugger/cdbbridge.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index ce88c903a77..7674a37b710 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -331,8 +331,7 @@ class Dumper(DumperBase):
         self.qtNamespace = lambda: namespace
         return namespace
 
-    def qtVersion(self):
-        qtVersion = None
+    def extractQtVersion(self):
         try:
             qtVersion = self.parseAndEvaluate(
                 '((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer()
@@ -344,10 +343,7 @@ class Dumper(DumperBase):
                     (major, minor, patch) = version.decode('latin1').split('.')
                     qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
                 except:
-                    pass
-        if qtVersion is None:
-            qtVersion = self.fallbackQtVersion
-        self.qtVersion = lambda: qtVersion
+                    return None
         return qtVersion
 
     def putVtableItem(self, address):