From 8e40e629e7485714a383121868ea5897c7ab7ed7 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Wed, 13 Mar 2013 13:13:17 +0100
Subject: [PATCH] Debugger: cdbext: Unify QByteArray output.

Change-Id: Iea2a5f581da28dc393d918a9b428d2cbe44474df
Reviewed-by: David Schulz <david.schulz@digia.com>
---
 src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 8d58a3ab8bc..40d3bf10b54 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -1713,12 +1713,12 @@ static inline bool dumpQByteArray(const SymbolGroupValue &v, std::wostream &str,
             const char c = *p;
             display.push_back(c >= 0 && isprint(c) ? wchar_t(c) : L'.');
         }
-        str << fullSize << L" bytes \"" << display;
+        str << "\"" << display;
         if (fullSize > size)
             str << L"...";
         str << L'"';
     } else {
-        str << L"<empty>";
+        str << L"\"\"";
     }
     if (memoryHandle)
         *memoryHandle = new MemoryHandle(reinterpret_cast<unsigned char *>(memory), size);
@@ -2782,7 +2782,8 @@ static inline std::vector<AbstractSymbolGroupNode *>
     unsigned size = 0;
     ULONG64 address = 0;
     if (QtInfo::get(ctx).version > 4) {
-        const QtStringAddressData data = readQtStringAddressData(dV, 5);
+        const SymbolGroupValue adV = dV["QArrayData"];
+        const QtStringAddressData data = readQtStringAddressData(adV, 5);
         size = data.size;
         address = data.address;
     } else {
@@ -2796,7 +2797,7 @@ static inline std::vector<AbstractSymbolGroupNode *>
     if (size > 200)
         size = 200;
     rc.reserve(size);
-    const std::string charType = "unsigned char";
+    const std::string charType = "char";
     std::string errorMessage;
     SymbolGroup *sg = n->symbolGroup();
     for (int i = 0; i < (int)size; ++i, ++address) {