From 9be10225cc5a85a87e70638952e742ba5dab2503 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 13 May 2022 10:05:47 +0200
Subject: [PATCH] Dumper: Fix Environment dumper

Change-Id: I48349ca550981d19cf0087bccd38e4d2677d1897
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/debugger/creatortypes.py | 54 +++++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/share/qtcreator/debugger/creatortypes.py b/share/qtcreator/debugger/creatortypes.py
index 5d6b5e04141..1a75590e4e4 100644
--- a/share/qtcreator/debugger/creatortypes.py
+++ b/share/qtcreator/debugger/creatortypes.py
@@ -263,32 +263,44 @@ def qdump__Utils__Environment(d, value):
     qdump__Utils__NameValueDictionary(d, value)
 
 
+def qdump__Utils__DictKey(d, value):
+    d.putStringValue(value["name"])
+
+
 def qdump__Utils__NameValueDictionary(d, value):
-    dptr = d.extractPointer(value["m_values"])
-    (ref, n) = d.split('ii', dptr)
-    d.check(0 <= n and n <= 100 * 1000 * 1000)
-    d.check(-1 <= ref and ref < 100000)
+    dptr = d.extractPointer(value)
+    if d.qtVersion() >= 0x60000:
+        if dptr == 0:
+            d.putItemCount(0)
+            return
+        m = value['d']['d']['m']
+        d.putItem(m)
+        d.putBetterType('Utils::NameValueDictionary')
+    else: # Qt5
+        (ref, n) = d.split('ii', dptr)
+        d.check(0 <= n and n <= 100 * 1000 * 1000)
+        d.check(-1 <= ref and ref < 100000)
 
-    d.putItemCount(n)
-    if d.isExpanded():
-        if n > 10000:
-            n = 10000
+        d.putItemCount(n)
+        if d.isExpanded():
+            if n > 10000:
+                n = 10000
 
-        typeCode = 'ppp@{%s}@{%s}' % ("Utils::DictKey", "QString")
+            typeCode = 'ppp@{%s}@{%s}' % ("Utils::DictKey", "@QPair<@QString,bool>")
 
-        def helper(node):
-            (p, left, right, padding1, key, padding2, value) = d.split(typeCode, node)
-            if left:
-                for res in helper(left):
-                    yield res
-            yield (key["name"], value)
-            if right:
-                for res in helper(right):
-                    yield res
+            def helper(node):
+                (p, left, right, padding1, key, padding2, value) = d.split(typeCode, node)
+                if left:
+                    for res in helper(left):
+                        yield res
+                yield (key["name"], value)
+                if right:
+                    for res in helper(right):
+                        yield res
 
-        with Children(d, n):
-            for (pair, i) in zip(helper(dptr + 8), range(n)):
-                d.putPairItem(i, pair, 'key', 'value')
+            with Children(d, n):
+                for (pair, i) in zip(helper(dptr + 8), range(n)):
+                    d.putPairItem(i, pair, 'key', 'value')
 
 
 def qdump__Utf8String(d, value):