diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index ebe100ce436..df9913c4f87 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -1500,7 +1500,42 @@ def qdump__QScopedPointer(d, value):
 
 
 def qdump__QSet(d, value):
+    if d.qtVersion() >= 0x060000:
+        qdumpHelper_QSet6(d, value)
+    else:
+        qdumpHelper_QSet45(d, value)
 
+def qdumpHelper_QSet6(d, value):
+    dptr = d.extractPointer(value)
+    if dptr == 0:
+        d.putItemCount(0)
+        return
+
+    ref, _, size, buckets, seed, spans = d.split('i@qqqp', dptr)
+
+    d.check(0 <= size and size <= 100 * 1000 * 1000)
+    d.check(-1 <= ref and ref < 100000)
+    d.putItemCount(size)
+
+    if d.isExpanded():
+        value_type = value.type[0]
+        value_size = value_type.size()
+        with Children(d, size):
+            span_size = 128 + 2 * d.ptrSize() # Including tail padding.
+            nspans = int((buckets + 127) / 128)
+            count = 0
+            for b in range(nspans):
+                span = spans + b * span_size
+                offsets, entries, allocated, next_free = d.split('128spbb', span)
+                for i in range(128):
+                    offset = offsets[i]
+                    if offset != 255: # Entry is used
+                        entry = entries + offset * value_size
+                        d.putSubItem(count, d.createValue(entry, value_type))
+                        count += 1
+
+
+def qdumpHelper_QSet45(d, value):
     def hashDataFirstNode():
         b = buckets
         n = numBuckets
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 7c79aa5720f..fdb084bdfc4 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -396,6 +396,11 @@ struct Value5 : Value
     Value5(const QString &value) : Value(value) { qtVersion = 5; }
 };
 
+struct Value6 : Value
+{
+    Value6(const QString &value) : Value(value) { qtVersion = 6; }
+};
+
 struct UnsubstitutedValue : Value
 {
     UnsubstitutedValue(const QString &value) : Value(value) { substituteNamespace = false; }
@@ -2006,6 +2011,8 @@ void tst_Dumpers::dumper()
         }
         if (!setok) {
             qDebug() << "NO CHECK IN SET PASSED";
+            for (const Check &check : checkset.checks)
+                qDebug() << check;
             ok = false;
         }
     }
@@ -3388,6 +3395,8 @@ void tst_Dumpers::dumper_data()
                     "uint qHash(const QPointer<QObject> &p) { return (quintptr)p.data(); }\n"
                     "QT_END_NAMESPACE\n",
 
+                    "QSet<double> s0;\n"
+
                     "QSet<int> s1;\n"
                     "s1.insert(11);\n"
                     "s1.insert(22);\n\n"
@@ -3403,19 +3412,23 @@ void tst_Dumpers::dumper_data()
                     "s3.insert(ptr);\n"
                     "s3.insert(ptr);\n",
 
-                    "&s1, &s2, &s3")
+                    "&s0, &s1, &s2, &s3")
 
                + CoreProfile()
 
+               + Check("s0", "<0 items>", "@QSet<double>")
+
                + Check("s1", "<2 items>", "@QSet<int>")
-               + Check("s1.0", "[0]", "22", "int")
-               + Check("s1.1", "[1]", "11", "int")
+               + CheckSet({{"s1.0", "[0]", "22", "int"},
+                           {"s1.0", "[0]", "11", "int"}})
+               + CheckSet({{"s1.1", "[1]", "22", "int"},
+                           {"s1.1", "[1]", "11", "int"}})
 
                + Check("s2", "<2 items>", "@QSet<@QString>")
-               + Check("s2.0", "[0]", Value4("\"11.0\""), "@QString")
-               + Check("s2.0", "[0]", Value5("\"22.0\""), "@QString")
-               + Check("s2.1", "[1]", Value4("\"22.0\""), "@QString")
-               + Check("s2.1", "[1]", Value5("\"11.0\""), "@QString")
+               + CheckSet({{"s2.0", "[0]", "\"11.0\"", "@QString"},
+                           {"s2.0", "[0]", "\"22.0\"", "@QString"}})
+               + CheckSet({{"s2.1", "[1]", "\"11.0\"", "@QString"},
+                           {"s2.1", "[1]", "\"22.0\"", "@QString"}})
 
                + Check("s3", "<1 items>", "@QSet<@QPointer<@QObject>>")
                + Check("s3.0", "[0]", "", "@QPointer<@QObject>");