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

Debugger: Fix QFileDumper

Browse Source 
Some QRingBuffer member got removed in 8f92baf5c9.

Change-Id: Ie0066db3b61bff25751a4886cb4b584cc4db49bf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-30 15:07:28 +02:00
parent 2ec58eac25
commit b2daf07573
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/debugger/tst_offsets.cpp
+16 -1
View File
@@ -144,6 +144,10 @@ void tst_offsets::offsets()
QCOMPARE(actual, expect);
}
QT_BEGIN_NAMESPACE
extern quintptr Q_CORE_EXPORT qtHookData[];
QT_END_NAMESPACE
void tst_offsets::offsets_data()
{
QTest::addColumn<int>("actual");
@@ -151,8 +155,19 @@ void tst_offsets::offsets_data()
QTest::addColumn<int>("expected64");
const int qtVersion = QT_VERSION;
const quintptr qtTypeVersion = qtHookData[6];
if (qtVersion >= 0x50700)
if (qtVersion > 0x50600 && qtTypeVersion >= 17)
#ifdef Q_OS_WIN
# ifdef Q_CC_MSVC
OFFSET_TEST(QFilePrivate, fileName) << 164 << 224;
# else // MinGW
OFFSET_TEST(QFilePrivate, fileName) << 160 << 224;
# endif
#else
OFFSET_TEST(QFilePrivate, fileName) << 156 << 224;
#endif
else if (qtVersion >= 0x50700)
#ifdef Q_OS_WIN
# ifdef Q_CC_MSVC
OFFSET_TEST(QFilePrivate, fileName) << 176 << 248;