From 777ae8b87b94b41e8af35ea786804bfc51e6c184 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 3 Jun 2020 14:10:47 +0200 Subject: Debugger: Adapt offset tests to changed QDateTime structure layout Chandge with 5f1f0fe0b71c in qtbase. Change-Id: Ifceac5125f974a1ebd2ab2e358ba906188d451a2 Reviewed-by: Christian Kandeler --- tests/auto/debugger/tst_offsets.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 90d1cfa3ef..5fa28d9897 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 -- cgit v1.2.1