diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 2ae74249605e2941965faeeea5ee2e405d7c9c3d..a7cf0c3a5e7a464f25a61c3a1ed41c85f17d5d16 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -898,9 +898,13 @@ def qdumpHelper__Qt4_QMap(d, value, forceLong):
         # QMapPayloadNode is QMapNode except for the 'forward' member, so
         # its size is most likely the offset of the 'forward' member therein.
         # Or possibly 2 * sizeof(void *)
-        nodeType = d.lookupType(d.qtNamespace() + "QMapNode<%s,%s>" % (keyType, valueType))
+        # Note: Keeping the spacing in the type lookup
+        # below is important for LLDB.
+        needle = str(value.type).replace("QMap", "QMapNode", 1)
+        nodeType = d.lookupType(needle)
         nodePointerType = nodeType.pointer()
-        if d.isArmArchitecture() and d.isQnxTarget() and str(valueType) == 'QVariant': # symbols reports payload size at wrong size 24
+        # symbols reports payload size at wrong size 24
+        if d.isArmArchitecture() and d.isQnxTarget() and str(valueType) == 'QVariant':
             payloadSize = 28
         else:
             payloadSize = nodeType.sizeof - 2 * nodePointerType.sizeof