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

debugger: fix dumper for QString::isNull()

Browse Source
This commit is contained in:
hjk
2009-12-01 15:31:52 +01:00
parent 9af0027158
commit ebff16f8b1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -715,7 +715,10 @@ void QDumper::putBase64Encoded(const char *buf, int n)
void QDumper::putStringValue(const QString &str)
{
if (str.isNull()) {
putItem("value", "\"\" (null)");
beginItem("value");
putBase64Encoded("\"\" (null)", 9);
endItem();
putItem("valueencoded", "5");
} else {
putItem("value", str);
putItem("valueencoded", "2");

7
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -462,7 +462,8 @@ static const QByteArray ptrToBa(const void *p, bool symbolicNull = true)
static const QByteArray generateQStringSpec(const QString &str, bool isNull = false)
{
if (isNull)
return QByteArray("value=''' (null)',type='"NS"QString',numchild='0'");
return QByteArray("value='IiIgKG51bGwp',valueencoded='5',"
"type='"NS"QString',numchild='0'");
return
QByteArray("value='%',valueencoded='2',type='"NS"QString',numchild='0'")
<< utfToBase64(str);
@@ -2263,7 +2264,7 @@ void tst_Debugger::dumpQSharedPointer()
void tst_Debugger::dumpQString()
{
QString s;
testDumper("value=''' (null)',type='$T',numchild='0'",
testDumper("value='IiIgKG51bGwp',valueencoded='5',type='$T',numchild='0'",
&s, NS"QString", false);
s = "abc";
testDumper("value='YQBiAGMA',valueencoded='2',type='$T',numchild='0'",
@@ -2427,7 +2428,7 @@ void tst_Debugger::initTestCase()
QVERIFY(sizeof(int) == sizeof(d.weakref));
QVERIFY(sizeof(int) == sizeof(d.strongref));
const size_t qObjectPrivateSize = sizeof(QObjectPrivate);
const size_t objectPrivateSize = sizeof(ObjectPrivate);
const size_t objectPrivateSize = sizeof(ObjectPrivate);
QVERIFY2(qObjectPrivateSize == objectPrivateSize, QString::fromLatin1("QObjectPrivate=%1 ObjectPrivate=%2").arg(qObjectPrivateSize).arg(objectPrivateSize).toLatin1().constData());
VERIFY_OFFSETOF(threadData);
VERIFY_OFFSETOF(extraData);