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

Debugger: More autotest tweaking

Browse Source 
Change-Id: Ib823b0d9b6a0eeeaf5ec8b04b6f31fb07065a8cc
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-01-15 11:14:11 +01:00
parent c1ff266e3e
commit fb0d8661d3
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
share/qtcreator/debugger/qttypes.py
View File

@@ -350,21 +350,24 @@ def qdump__QDir(d, value):
# + 2 byte padding
fileSystemEntrySize = 2 * d.ptrSize() + 8
# Try to distinguish bool vs QStringList at the beginning:
firstValue = d.extractInt(privAddress)
if firstValue == 0 or firstValue == 1:
# Looks like a bool. Assume this is after 9fc0965.
if bit32:
filesOffset = 4
fileInfosOffset = 8
dirEntryOffset = 0x20
absoluteDirEntryOffset = 0x30
else:
filesOffset = 0x08
fileInfosOffset = 0x10
dirEntryOffset = 0x30
absoluteDirEntryOffset = 0x48
else:
done = False
if d.qtVersion() >= 0x050200:
# Try to distinguish bool vs QStringList at the beginning:
firstValue = d.extractInt(privAddress)
if firstValue == 0 or firstValue == 1:
# Looks like a bool. Assume this is after 9fc0965.
done = True
if bit32:
filesOffset = 4
fileInfosOffset = 8
dirEntryOffset = 0x20
absoluteDirEntryOffset = 0x30
else:
filesOffset = 0x08
fileInfosOffset = 0x10
dirEntryOffset = 0x30
absoluteDirEntryOffset = 0x48
if not done:
# Assume this is before 9fc0965.
qt3support = d.isQt3Support()
qt3SupportAddition = d.ptrSize() if qt3support else 0

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

@@ -4949,9 +4949,11 @@ void tst_Dumpers::dumper_data()
"MyFile file(\"/tmp/tt\");\n"
"file.setObjectName(\"A file\");\n")
% CoreProfile()
% QtVersion(50000)
% Check("file", "\"A file\"", "MyFile")
% Check("file.@1", "[QFile]", "\"/tmp/tt\"", "@QFile")
% Check("file.@1.[QFileDevice]", "[QFileDevice]", "\"A file\"", "@QFileDevice");
% Check("file.@1", "[@QFile]", "\"/tmp/tt\"", "@QFile");
// FIXME: The classname in the iname is sub-optimal.
//% Check("file.@1.[QFileDevice]", "[@QFileDevice]", "\"A file\"", "@QFileDevice");
//% Check("file.@1.@1", "[QFile]", "\"A file\"", "@QObject");
#endif