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

Fix QDateTime dumper with various Qt versions and bitness

Browse Source 
Change-Id: Iba15c1b27dc83e8949fef5fd25de61cc2b20be30
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Eike Ziller
2013-10-24 15:09:36 +02:00
committed by hjk
parent 9b88e0db32
commit 9a57a41a7a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,8 +235,8 @@ def qdump__QDateTime(d, value):
# This relies on the Qt4/Qt5 internal structure layout: # This relies on the Qt4/Qt5 internal structure layout:
# {sharedref(4), ... # {sharedref(4), ...
base = d.dereferenceValue(value) base = d.dereferenceValue(value)
dateBase = base + d.ptrSize() # Only QAtomicInt, but will be padded.
if qtVersion >= 0x050200: if qtVersion >= 0x050200:
dateBase = base + d.ptrSize() # Only QAtomicInt, but will be padded.
ms = d.extractInt64(dateBase) ms = d.extractInt64(dateBase)
offset = d.extractInt(dateBase + 12) offset = d.extractInt(dateBase + 12)
isValid = ms > 0 isValid = ms > 0
@@ -248,11 +248,14 @@ def qdump__QDateTime(d, value):
# QDateTimePrivate: # QDateTimePrivate:
# - QAtomicInt ref; (padded on 64 bit) # - QAtomicInt ref; (padded on 64 bit)
# - [QDate date;] # - [QDate date;]
# - - uint jd in Qt 4, qint64 in Qt 5.0 and Qt 5.2; padded on 64 bit # - - uint jd in Qt 4, qint64 in Qt 5.0 and Qt 5.1; padded on 64 bit
# - [QTime time;] # - [QTime time;]
# - - uint mds; # - - uint mds;
# - Spec spec; # - Spec spec;
dateSize = 4 if qtVersion < 0x050000 and d.is32bit() else 8 dateSize = 8 if qtVersion >= 0x050000 else 4 # Qt5: qint64, Qt4 uint
# 4 byte padding after 4 byte QAtomicInt if we are on 64 bit and QDate is 64 bit
refPlusPadding = 8 if qtVersion >= 0x050000 and not d.is32bit() else 4
dateBase = base + refPlusPadding
timeBase = dateBase + dateSize timeBase = dateBase + dateSize
mds = d.extractInt(timeBase) mds = d.extractInt(timeBase)
isValid = mds > 0 isValid = mds > 0