aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-05-07 12:53:56 +0200
committerhjk <qthjk@ovi.com>2012-05-07 13:19:16 +0200
commit82170f0050b4715b28611aabe006a28b617a594e (patch)
tree608e0a671cd240dd8dbf56b9d41f47f32587ebcb
parentefbe35787fc6b9825e26d85c22faa926d21f4e5d (diff)
CDB: Dump Qt 5 / QString correctly.
Adapt to recent change basing QStringData on QTypedArrayData. Change-Id: I8145015e31ca10bc484d01e8082a2f97d6750285 Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--src/libs/qtcreatorcdbext/symbolgroupvalue.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 10f948cfa8..d20776efcd 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -1495,7 +1495,10 @@ static inline bool dumpQString(const SymbolGroupValue &v, std::wostream &str)
wchar_t *memory;
unsigned fullSize;
unsigned size;
- if (!readQt5StringData(dV, qtInfo.version, true, 10240, &fullSize, &size, &memory))
+ const SymbolGroupValue typeArrayV = dV[unsigned(0)];
+ if (!typeArrayV)
+ return false;
+ if (!readQt5StringData(typeArrayV, qtInfo.version, true, 10240, &fullSize, &size, &memory))
return false;
if (size) {
str << L'"' << memory;