diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 08:22:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 08:22:10 +0200 |
| commit | 623e607b2316ee0349763e681b3f744e2e376292 (patch) | |
| tree | e42fb7d43d7aa3a4133a14c3f34c8c9c1a9e04e0 /tests/auto/debugger | |
| parent | d62acfdefa3e07093742c50bada870f69b7ad1c3 (diff) | |
| parent | 63bb91f0b78f7ab2f969dee1ad488f2c1f9058f5 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I19a7406f7e387b53f1e7b3f08a0b4c89a377ab82
Diffstat (limited to 'tests/auto/debugger')
| -rw-r--r-- | tests/auto/debugger/tst_offsets.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index b06ce1482c..2309b5296a 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -272,11 +272,16 @@ void tst_offsets::offsets_data() OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; OFFSET_TEST(QDateTimePrivate, m_status) << 24 << 32; # endif -#else +#elif QT_VERSION < 0x50e00 OFFSET_TEST(QDateTimePrivate, m_msecs) << 0 << 0; OFFSET_TEST(QDateTimePrivate, m_status) << 8 << 8; OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 12 << 12; OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; +#else + OFFSET_TEST(QDateTimePrivate, m_msecs) << 8 << 8; + OFFSET_TEST(QDateTimePrivate, m_status) << 4 << 4; + OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 16 << 16; + OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; #endif #ifdef HAS_BOOST |