summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-03 14:10:47 +0200
committerhjk <hjk@qt.io>2020-06-04 03:14:25 +0000
commit777ae8b87b94b41e8af35ea786804bfc51e6c184 (patch)
tree420326fc01c61e29da8267cb05373f2843dedc3c
parent33c5ff216a98ec6db6e03d816b7513c098103566 (diff)
downloadqt-creator-777ae8b87b94b41e8af35ea786804bfc51e6c184.tar.gz
Debugger: Adapt offset tests to changed QDateTime structure layout
Chandge with 5f1f0fe0b71c in qtbase. Change-Id: Ifceac5125f974a1ebd2ab2e358ba906188d451a2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/debugger/tst_offsets.cpp7
1 files changed, 6 insertions, 1 deletions
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