diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /share/qtcreator/debugger/dumper.py | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
| download | qt-creator-428fcb476ba2c5bbe1d16dfe437e510dafce1777.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'share/qtcreator/debugger/dumper.py')
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 503fae19c3..4805545d24 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -2245,6 +2245,11 @@ class DumperBase: p += 1 def extractPointer(self, value): + try: + if value.type.code == TypeCodeArray: + return value.address() + except: + pass code = 'I' if self.ptrSize() == 4 else 'Q' return self.extractSomething(value, code, 8 * self.ptrSize()) |