diff options
| author | hjk <hjk@qt.io> | 2018-01-22 12:41:49 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-01-22 13:59:42 +0000 |
| commit | 58f457f40584b562ceda6e6f62c04b943a544f0b (patch) | |
| tree | 38786efdde7083aae3e2c861025c1bedee08e349 /share | |
| parent | 3e81fe628a5e7787ef015616754b2f3a79bceb41 (diff) | |
Debugger: Also extract Qt namespaces for libinfixed Qt build
GDB-only for now.
Task-number: QTCREATORBUG-19620
Change-Id: I2ca3a927623ec0df742fed65048e8a3bcfa5cee2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/gdbbridge.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 0425641c6d..320695a750 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): |