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

Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit

Browse Source 
Change-Id: Idb14d81aa3546af0e7a21922fbb6d551ecbc1b06
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-11-10 20:42:30 +01:00
parent 1fd8760789
commit 0f9e2baa1b
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,7 +422,12 @@ def qdump__QFile(d, value):
# 9fc0965 and a373ffcd change the layout of the private structure # 9fc0965 and a373ffcd change the layout of the private structure
qtVersion = d.qtVersion() qtVersion = d.qtVersion()
is32bit = d.is32bit() is32bit = d.is32bit()
if qtVersion >= 0x050500: if qtVersion >= 0x050600:
if d.isWindowsTarget():
offset = 164 if is32bit else 248
else:
offset = 168 if is32bit else 248
elif qtVersion >= 0x050500:
if d.isWindowsTarget(): if d.isWindowsTarget():
offset = 164 if is32bit else 248 offset = 164 if is32bit else 248
else: else:

12
tests/auto/debugger/tst_offsets.cpp
View File

@@ -83,7 +83,17 @@ void tst_offsets::offsets_data()
QFilePrivate *p = 0; QFilePrivate *p = 0;
QTestData &data = QTest::newRow("QFilePrivate::fileName") QTestData &data = QTest::newRow("QFilePrivate::fileName")
<< int((char *)&p->fileName - (char *)p); << int((char *)&p->fileName - (char *)p);
if (qtVersion >= 0x50500) if (qtVersion >= 0x50600)
#ifdef Q_OS_WIN
# ifdef Q_CC_MSVC
data << 176 << 248;
# else // MinGW
data << 164 << 248;
# endif
#else
data << 168 << 248;
#endif
else if (qtVersion >= 0x50500)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
# ifdef Q_CC_MSVC # ifdef Q_CC_MSVC
data << 176 << 248; data << 176 << 248;