diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
| commit | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (patch) | |
| tree | f97fe44d83aa76a9c2629039aa44ebef82d5d91b /share/qtcreator/debugger/gdbbridge.py | |
| parent | 765d3a6bc0343f3f26f9d2dbd65373b29f07177f (diff) | |
| parent | 7051ba84984b20676ef2de07349e56b0d7bdfa8c (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
Diffstat (limited to 'share/qtcreator/debugger/gdbbridge.py')
| -rw-r--r-- | share/qtcreator/debugger/gdbbridge.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index bcaf8ed314c..ecc53a8f328 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -341,7 +341,12 @@ class Dumper(DumperBase): #DumperBase.warn('ARRAY') nativeTargetType = nativeType.target().unqualified() targetType = self.fromNativeType(nativeTargetType) - count = nativeType.sizeof // nativeTargetType.sizeof + if nativeType.sizeof == 0: + # QTCREATORBUG-23998, note that nativeType.name == None here, + # whereas str(nativeType) returns sth like 'QObject [5]' + count = self.arrayItemCountFromTypeName(str(nativeType), 1) + else: + count = nativeType.sizeof // nativeTargetType.sizeof return self.createArrayType(targetType, count) if code == gdb.TYPE_CODE_TYPEDEF: |