From 1a161c8ede4ea8c18c1d33d97a847387ca2c770e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 30 Apr 2016 22:06:09 -0700 Subject: QDateTimePrivate: merge the time spec, DST status and validity flags Storing them in a single byte is the first step towards the Short QDateTime Optimization. The bump in the "private version" by 10 is to accommodate possible changes in the Qt 5.7 branch. Change-Id: Id5480807d25e49e78b79ffff144a59420457bcf0 Reviewed-by: Edward Welbourne Reviewed-by: Lars Knoll --- tests/auto/other/toolsupport/tst_toolsupport.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'tests/auto/other/toolsupport') diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp index 7942a84615..f93c8f825b 100644 --- a/tests/auto/other/toolsupport/tst_toolsupport.cpp +++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp @@ -129,29 +129,14 @@ void tst_toolsupport::offsets_data() #endif { -#ifdef Q_OS_WIN QTest::newRow("QDateTimePrivate::m_msecs") - << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8; - QTest::newRow("QDateTimePrivate::m_spec") - << pmm_to_offsetof(&QDateTimePrivate::m_spec) << 16 << 16; - QTest::newRow("QDateTimePrivate::m_offsetFromUtc") - << pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 20 << 20; - QTest::newRow("QDateTimePrivate::m_timeZone") - << pmm_to_offsetof(&QDateTimePrivate::m_timeZone) << 24 << 24; + << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 0 << 0; QTest::newRow("QDateTimePrivate::m_status") - << pmm_to_offsetof(&QDateTimePrivate::m_status) << 28 << 32; -#else - QTest::newRow("QDateTimePrivate::m_msecs") - << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 4 << 8; - QTest::newRow("QDateTimePrivate::m_spec") - << pmm_to_offsetof(&QDateTimePrivate::m_spec) << 12 << 16; + << pmm_to_offsetof(&QDateTimePrivate::m_status) << 8 << 8; QTest::newRow("QDateTimePrivate::m_offsetFromUtc") - << pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 16 << 20; + << pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 12 << 12; QTest::newRow("QDateTimePrivate::m_timeZone") << pmm_to_offsetof(&QDateTimePrivate::m_timeZone) << 20 << 24; - QTest::newRow("QDateTimePrivate::m_status") - << pmm_to_offsetof(&QDateTimePrivate::m_status) << 24 << 32; -#endif } #endif // RUN_MEMBER_OFFSET_TEST } -- cgit v1.2.3