3 files changed, 52 insertions, 1 deletions

diff --git a/src/libs/qtcreatorcdbext/containers.cpp b/src/libs/qtcreatorcdbext/containers.cpp
index 8fbd64f0a5..3b6f9362dd 100644
--- a/src/libs/qtcreatorcdbext/containers.cpp
+++ b/src/libs/qtcreatorcdbext/containers.cpp
@@ -203,7 +203,18 @@ int containerSize(KnownType kt, const SymbolGroupValue &v)
         if (const SymbolGroupValue deque =  v[unsigned(0)])
             return containerSize(KT_StdDeque, deque);
         break;
+    case KT_StdArray: {
+        std::string::size_type arraySizeStart = v.type().find(',');
+        if (arraySizeStart != std::string::npos) {
+            ++arraySizeStart;
+            std::string::size_type arraySizeEnd = v.type().find('>', arraySizeStart);
+            if (arraySizeEnd != std::string::npos)
+                return std::stoi(v.type().substr(arraySizeStart, arraySizeEnd - arraySizeStart));
+        }
+        break;
     }
+    }
+
     return -1;
 }
 
@@ -253,6 +264,22 @@ static inline AbstractSymbolGroupNodePtrVector stdListChildList(SymbolGroupNode
     return AbstractSymbolGroupNodePtrVector();
 }
 
+static inline AbstractSymbolGroupNodePtrVector stdArrayChildList(SymbolGroupNode *n, int count,
+                                                        const SymbolGroupValueContext &ctx)
+{
+    AbstractSymbolGroupNodePtrVector rc;
+    if (SymbolGroupValue elems = SymbolGroupValue(n, ctx)["_Elems"]) {
+        rc.reserve(count);
+        for (int i = 0; i < count; ++i) {
+            if (const SymbolGroupValue value = elems[i])
+                rc.push_back(ReferenceSymbolGroupNode::createArrayNode(i, value.node()));
+            else
+                break;
+        }
+    }
+    return rc;
+}
+
 // QLinkedList<T>: Dummy head node and then a linked list of "n", "t".
 static inline AbstractSymbolGroupNodePtrVector qLinkedListChildList(SymbolGroupNode *n, int count,
                                                         const SymbolGroupValueContext &ctx)
@@ -1109,6 +1136,8 @@ AbstractSymbolGroupNodePtrVector containerChildren(SymbolGroupNode *node, int ty
         break;
     case KT_StdList:
         return stdListChildList(node, size , ctx);
+    case KT_StdArray:
+        return stdArrayChildList(node, size , ctx);
     case KT_StdDeque:
         return stdDequeChildList(SymbolGroupValue(node, ctx), size);
     case KT_StdStack:
diff --git a/src/libs/qtcreatorcdbext/knowntype.h b/src/libs/qtcreatorcdbext/knowntype.h
index ee609567bc..206f971ebf 100644
--- a/src/libs/qtcreatorcdbext/knowntype.h
+++ b/src/libs/qtcreatorcdbext/knowntype.h
@@ -72,6 +72,7 @@ enum KnownType
     KT_QBasicAtomicInt = KT_Qt_Type + KT_HasSimpleDumper + 18,
     KT_QAtomicInt = KT_Qt_Type + KT_HasSimpleDumper + 19,
     KT_QStringRef = KT_Qt_Type + KT_HasSimpleDumper + 20,
+    KT_QTextCursor = KT_Qt_Type + KT_HasSimpleDumper + 21,
     KT_QObject = KT_Qt_Type + KT_HasSimpleDumper + KT_HasComplexDumper + 20,
     KT_QWindow = KT_Qt_Type + KT_HasSimpleDumper + KT_HasComplexDumper + 21,
     KT_QWidget = KT_Qt_Type + KT_HasSimpleDumper + KT_HasComplexDumper + 22,
@@ -173,7 +174,8 @@ enum KnownType
     KT_StdDeque =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 4,
     KT_StdSet =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 5,
     KT_StdMap =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 6,
-    KT_StdMultiMap =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 7
+    KT_StdMultiMap =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 7,
+    KT_StdArray =  KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 8
 };
 
 #endif // KNOWNTYPE_H
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 19635c4212..f7d13fa08c 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -1078,6 +1078,8 @@ static KnownType knownClassTypeHelper(const std::string &type,
                     return KT_StdStack;
                 if (!type.compare(hPos, 5, "deque"))
                     return KT_StdDeque;
+                if (!type.compare(hPos, 5, "array"))
+                    return KT_StdArray;
                 break;
             case 6:
                 if (!type.compare(hPos, 6, "vector"))
@@ -1281,6 +1283,8 @@ static KnownType knownClassTypeHelper(const std::string &type,
             return KT_QFixedPoint;
         if (!type.compare(qPos, 11, "QScriptLine"))
             return KT_QScriptLine;
+        if (!type.compare(qPos, 11, "QTextCursor"))
+            return KT_QTextCursor;
         break;
     case 12:
         if (!type.compare(qPos, 12, "QKeySequence"))
@@ -2383,6 +2387,18 @@ static inline bool dumpQWindow(const SymbolGroupValue &v, std::wostream &str, vo
     return true;
 }
 
+//Dump a QTextCursor
+static inline bool dumpQTextCursor(const SymbolGroupValue &v, std::wostream &str)
+{
+    const unsigned offset = SymbolGroupValue::pointerSize() + SymbolGroupValue::sizeOf("double");
+    const ULONG64 posAddr = addressOfQPrivateMember(v, QPDM_qSharedDataPadded, offset);
+    if (!posAddr)
+        return false;
+    const int position = SymbolGroupValue::readIntValue(v.context().dataspaces, posAddr);
+    str << position;
+    return true;
+}
+
 // Dump a std::string.
 static bool dumpStd_W_String(const SymbolGroupValue &v, int type, std::wostream &str,
                              MemoryHandle **memoryHandle = 0)
@@ -2796,6 +2812,10 @@ unsigned dumpSimpleType(SymbolGroupNode  *n, const SymbolGroupValueContext &ctx,
     case KT_StdWString:
         rc = dumpStd_W_String(v, kt, str, memoryHandleIn) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
         break;
+    case KT_QTextCursor:
+        rc = dumpQTextCursor(v, str) ? SymbolGroupNode::SimpleDumperOk
+                                     : SymbolGroupNode::SimpleDumperFailed;
+        break;
     default:
         break;
     }