feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CDB: Fix dumping of objectNames() in Qt 5.

Browse Source 
Qt 5 has an additional extraData.

Change-Id: Ieac0a1855ed93b4ef2c0900e37097d89de440895
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-09-11 11:37:19 +02:00
committed by hjk
parent 0983e67fd1
commit 2fc6b24a8a
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -2122,21 +2122,32 @@ SymbolGroupValue qobjectDerivedPrivate(const SymbolGroupValue &v,
return SymbolGroupValue(qwPrivateNode, v.context()); return SymbolGroupValue(qwPrivateNode, v.context());
} }
static bool dumpQObjectName(const SymbolGroupValue &qoPrivate, std::wostream &str)
{
// Qt 4: plain member.
if (QtInfo::get(qoPrivate.context()).version < 5) {
if (const SymbolGroupValue oName = qoPrivate["objectName"])
return dumpQString(oName, str);
}
// Qt 5: member of allocated extraData.
if (const SymbolGroupValue extraData = qoPrivate["extraData"])
if (extraData.pointerValue())
if (const SymbolGroupValue oName = extraData["objectName"])
return dumpQString(oName, str);
return false;
}
// Dump the object name // Dump the object name
static inline bool dumpQWidget(const SymbolGroupValue &v, std::wostream &str, void **specialInfoIn = 0) static inline bool dumpQWidget(const SymbolGroupValue &v, std::wostream &str, void **specialInfoIn = 0)
{ {
const QtInfo &qtInfo = QtInfo::get(v.context()); const QtInfo &qtInfo = QtInfo::get(v.context());
const SymbolGroupValue qwPrivate = const SymbolGroupValue qwPrivate =
qobjectDerivedPrivate(v, qtInfo.qWidgetPrivateType, qtInfo); qobjectDerivedPrivate(v, qtInfo.qWidgetPrivateType, qtInfo);
if (!qwPrivate)
return false;
// QWidgetPrivate inherits QObjectPrivate // QWidgetPrivate inherits QObjectPrivate
const SymbolGroupValue oName = qwPrivate[unsigned(0)]["objectName"]; if (!qwPrivate || !dumpQObjectName(qwPrivate[unsigned(0)], str))
if (!oName)
return false; return false;
if (specialInfoIn) if (specialInfoIn)
*specialInfoIn = qwPrivate.node(); *specialInfoIn = qwPrivate.node();
dumpQString(oName, str);
return true; return true;
} }
@@ -2144,15 +2155,12 @@ static inline bool dumpQWidget(const SymbolGroupValue &v, std::wostream &str, vo
static inline bool dumpQObject(const SymbolGroupValue &v, std::wostream &str, void **specialInfoIn = 0) static inline bool dumpQObject(const SymbolGroupValue &v, std::wostream &str, void **specialInfoIn = 0)
{ {
const std::string &qoPrivateType = QtInfo::get(v.context()).qObjectPrivateType; const std::string &qoPrivateType = QtInfo::get(v.context()).qObjectPrivateType;
if (SymbolGroupValue qoPrivate = v["d_ptr"]["d"].pointerTypeCast(qoPrivateType.c_str())) { const SymbolGroupValue qoPrivate = v["d_ptr"]["d"].pointerTypeCast(qoPrivateType.c_str());
if (SymbolGroupValue oName = qoPrivate["objectName"]) { if (!qoPrivate || !dumpQObjectName(qoPrivate, str))
if (specialInfoIn) return false;
*specialInfoIn = qoPrivate.node(); if (specialInfoIn)
dumpQString(oName, str); *specialInfoIn = qoPrivate.node();
return true; return true;
}
}
return false;
} }
// Dump the object name // Dump the object name
@@ -2161,15 +2169,11 @@ static inline bool dumpQWindow(const SymbolGroupValue &v, std::wostream &str, vo
const QtInfo &qtInfo = QtInfo::get(v.context()); const QtInfo &qtInfo = QtInfo::get(v.context());
const SymbolGroupValue qwPrivate = const SymbolGroupValue qwPrivate =
qobjectDerivedPrivate(v, qtInfo.qWindowPrivateType, qtInfo); qobjectDerivedPrivate(v, qtInfo.qWindowPrivateType, qtInfo);
if (!qwPrivate)
return false;
// QWindowPrivate inherits QObjectPrivate // QWindowPrivate inherits QObjectPrivate
const SymbolGroupValue oName = qwPrivate[unsigned(0)]["objectName"]; // QWidgetPrivate inherits QObjectPrivate if (!qwPrivate || !dumpQObjectName(qwPrivate[unsigned(0)], str))
if (!oName)
return false; return false;
if (specialInfoIn) if (specialInfoIn)
*specialInfoIn = qwPrivate.node(); *specialInfoIn = qwPrivate.node();
dumpQString(oName, str);
return true; return true;
} }