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

Debugger: Also extract Qt namespaces for libinfixed Qt build

Browse Source 
GDB-only for now.

Task-number: QTCREATORBUG-19620
Change-Id: I2ca3a927623ec0df742fed65048e8a3bcfa5cee2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-01-22 12:41:49 +01:00
parent 3e81fe628a
commit 58f457f405
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/debugger/gdbbridge.py
View File

@@ -31,6 +31,7 @@ except:
import gdb import gdb
import os import os
import os.path import os.path
import re
import sys import sys
import struct import struct
import tempfile import tempfile
@@ -995,15 +996,11 @@ class Dumper(DumperBase):
def handleNewObjectFile(self, objfile): def handleNewObjectFile(self, objfile):
name = objfile.filename name = objfile.filename
if self.isWindowsTarget(): if self.isWindowsTarget():
isQtCoreObjFile = name.find('Qt5Cored.dll') >= 0 or name.find('Qt5Core.dll') >= 0 qtCoreMatch = re.match('.*Qt5?Core[^/.]*d?\.dll', name)
if not isQtCoreObjFile:
isQtCoreObjFile = name.find('QtCored.dll') >= 0 or name.find('QtCore.dll') >= 0
else: else:
isQtCoreObjFile = name.find('/libQt5Core') >= 0 qtCoreMatch = re.match('.*/libQt5?Core[^/.]\.so', name)
if not isQtCoreObjFile:
isQtCoreObjFile = name.find('/libQtCore') >= 0
if isQtCoreObjFile: if qtCoreMatch is not None:
self.handleQtCoreLoaded(objfile) self.handleQtCoreLoaded(objfile)
def handleQtCoreLoaded(self, objfile): def handleQtCoreLoaded(self, objfile):