diff options
| author | hjk <hjk@qt.io> | 2020-12-10 14:50:40 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-12-11 09:35:37 +0000 |
| commit | 14035584d8340e78d172ee6a1f1a39db1ebc9d6c (patch) | |
| tree | 23fb47f7ab845aea3783e8ccc84c9fa7c63ad8bf | |
| parent | 5cf60fc38f4380bdbb7f2bc0000cc535f7c15507 (diff) | |
Debugger: Fix CharArray dumper and test for LLDB
Change-Id: If12936fa863633b1ca85e712f8395e8ab4a0d69c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | share/qtcreator/debugger/lldbbridge.py | 2 | ||||
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 2b9078db21..44e361727b 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -471,6 +471,8 @@ class Dumper(DumperBase): tdata.code = TypeCode.Integral elif typeName == 'void': tdata.code = TypeCode.Void + elif typeName == 'wchar_t': + tdata.code = TypeCode.Integral else: self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code)) elif code == lldb.eTypeClassEnumeration: diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index a4c7e511ad..704d11cf0d 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -5762,7 +5762,7 @@ void tst_Dumpers::dumper_data() + Check("w", AnyValue, "wchar_t [4]") + Check("ch.0", "[0]", "97", TypePattern("char|CHAR")) + Check("ch", AnyValue, TypePattern("(char|CHAR)\\[5\\]")) - + Check("wch.0", "[0]", "97", TypeDef("wchar_t", "WCHAR")) + + Check("wch.0", "[0]", "97", TypePattern("wchar_t|WCHAR")) + Check("wch", AnyValue, TypePattern("(wchar_t|WCHAR)\\[4\\]")); |