diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 7bb6256e6609b8de41266efb6b1323f2e2803b5f..f4be9300945b238b570411b6cdea58e5b619284e 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -2083,7 +2083,16 @@ def qdump__QVariant(d, value):
             innert = qdumpHelper_QVariants_F[variantType - 75]
 
         data = value["d"]["data"]
-        inner = d.qtNamespace() + innert
+        ns = d.qtNamespace()
+        inner = ns + innert
+        if d.isLldb:
+            # Looking up typedefs is problematic.
+            if innert == "QVariantMap":
+                inner = "%sQMap<%sQString, %sQVariant>" % (ns, ns, ns)
+            elif innert == "QVariantHash":
+                inner = "%sQHash<%sQString, %sQVariant>" % (ns, ns, ns)
+            elif innert == "QVariantList":
+                inner = "%sQList<%sQVariant>" % (ns, ns)
         innerType = d.lookupType(inner)
 
         if toInteger(value["d"]["is_shared"]):
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 0927a360487832f02e4730dbbe9c88492ee36d20..92e9420df0923a0bc683b3ea47f92599f7001a22 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -3795,6 +3795,7 @@ void tst_Dumpers::dumper_data()
                     "#endif\n",
                     "QApplication app(argc, argv);\n"
                     "QRect r(100, 200, 300, 400);\n"
+                    "QPen pen;\n"
                     "QRectF rf(100.5, 200.5, 300.5, 400.5);\n"
                     "QUrl url = QUrl::fromEncoded(\"http://foo@qt-project.org:10/have_fun\");\n"
                     "QVariant var;                                  // Type 0, invalid\n"
@@ -3846,7 +3847,7 @@ void tst_Dumpers::dumper_data()
                     "QVariant var73 = QBitmap();                    // 73 QBitmap\n"
                     "QVariant var74 = QCursor();                    // 74 QCursor\n"
                     "QVariant var75 = QKeySequence();               // 75 QKeySequence\n"
-                    "QVariant var76 = QPen();                       // 76 QPen\n"
+                    "QVariant var76 = pen;                          // 76 QPen\n"
                     "QVariant var77 = QTextLength();                // 77 QTextLength\n"
                     "#if QT_VERSION < 0x050000\n"
                     "QVariant var78 = QTextFormat();                // 78 QTextFormat\n"