From aae5f4c8d81fc8b66c3a689c2abc70165d9fdd18 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 21 Mar 2013 15:44:51 -0700 Subject: [PATCH] cdbext: Fix dump of QDir. Change-Id: I863c45b9c54d39c2e879d9f4f4d080622348e1db Reviewed-by: Friedemann Kleint --- src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp index f2118d70e80..7c622a406f6 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp +++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp @@ -1804,12 +1804,10 @@ static inline bool dumpQFileInfo(const SymbolGroupValue &v, std::wostream &str) * Dump 1st string past its QSharedData base class. */ static bool inline dumpQDir(const SymbolGroupValue &v, std::wostream &str) { - // Access QDirPrivate's dirEntry, which has the path as first member. - const unsigned listSize = qListSize(v.context()); - const unsigned offset = padOffset(listSize + 2 * SymbolGroupValue::intSize()) - + padOffset(SymbolGroupValue::pointerSize() + SymbolGroupValue::sizeOf("bool")) - + 2 * listSize; - return dumpQStringFromQPrivateClass(v, QPDM_qSharedDataPadded, offset, str); + const unsigned offset = + v.fieldOffset(QtInfo::get(v.context()).prependQtCoreModule("QDirPrivate").c_str(), + "dirEntry.m_filePath"); + return dumpQStringFromQPrivateClass(v, QPDM_None, offset, str); } /* Dump QRegExp, for whose private class no debugging information is available.