Commit 4780f0ed authored by Christian Stenger's avatar Christian Stenger Committed by hjk

Tests: Fix offsets test for Qt5.4

Change-Id: I1517bfbde852af5db7088fa21b33a27e20f2db61
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 0d86ea4a
...@@ -83,7 +83,17 @@ void tst_offsets::offsets_data() ...@@ -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 > 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_OS_WIN
# ifdef Q_CC_MSVC # ifdef Q_CC_MSVC
data << 184 << 272; data << 184 << 272;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment