From 58f457f40584b562ceda6e6f62c04b943a544f0b Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 22 Jan 2018 12:41:49 +0100 Subject: [PATCH] Debugger: Also extract Qt namespaces for libinfixed Qt build GDB-only for now. Task-number: QTCREATORBUG-19620 Change-Id: I2ca3a927623ec0df742fed65048e8a3bcfa5cee2 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/gdbbridge.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 0425641c6df..320695a7507 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -31,6 +31,7 @@ except: import gdb import os import os.path +import re import sys import struct import tempfile @@ -995,15 +996,11 @@ class Dumper(DumperBase): def handleNewObjectFile(self, objfile): name = objfile.filename if self.isWindowsTarget(): - isQtCoreObjFile = name.find('Qt5Cored.dll') >= 0 or name.find('Qt5Core.dll') >= 0 - if not isQtCoreObjFile: - isQtCoreObjFile = name.find('QtCored.dll') >= 0 or name.find('QtCore.dll') >= 0 + qtCoreMatch = re.match('.*Qt5?Core[^/.]*d?\.dll', name) else: - isQtCoreObjFile = name.find('/libQt5Core') >= 0 - if not isQtCoreObjFile: - isQtCoreObjFile = name.find('/libQtCore') >= 0 + qtCoreMatch = re.match('.*/libQt5?Core[^/.]\.so', name) - if isQtCoreObjFile: + if qtCoreMatch is not None: self.handleQtCoreLoaded(objfile) def handleQtCoreLoaded(self, objfile):