diff options
| author | Christian Stenger <christian.stenger@theqtcompany.com> | 2015-01-29 12:52:22 +0100 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-01-29 12:04:43 +0000 |
| commit | 4780f0edbfd6b26977c4ae65b449a4be9842cc40 (patch) | |
| tree | 2cf41ee2f5cd6314919df3266e498dfa6805f25e | |
| parent | 0d86ea4a1c40ab19c5154ab84b4baff63dea9e0e (diff) | |
| download | qt-creator-4780f0edbfd6b26977c4ae65b449a4be9842cc40.tar.gz | |
Tests: Fix offsets test for Qt5.4
Change-Id: I1517bfbde852af5db7088fa21b33a27e20f2db61
Reviewed-by: hjk <hjk@theqtcompany.com>
| -rw-r--r-- | tests/auto/debugger/tst_offsets.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index a6e1d9255f..a8eb0d1547 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -83,7 +83,17 @@ void tst_offsets::offsets_data() QFilePrivate *p = 0; QTestData &data = QTest::newRow("QFilePrivate::fileName") << int((char *)&p->fileName - (char *)p); - if (qtVersion > 0x50200) + if (qtVersion >= 0x50400) +#ifdef Q_OS_WIN +# ifdef Q_CC_MSVC + data << 196 << 272; +# else // MinGW + data << 188 << 272; +# endif +#else + data << 180 << 272; +#endif + else if (qtVersion > 0x50200) #ifdef Q_OS_WIN # ifdef Q_CC_MSVC data << 184 << 272; |