From bdcb3f9aab139e31849aec46088dce52ba7673eb Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Wed, 14 Jan 2015 22:19:47 +0100 Subject: QHeaderView: fix restoring Qt4 state. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When multiple sections were grouped together, sectionItem.size was the total size of grouped sections, not the size of one section. Task-number: QTBUG-40462 Change-Id: I401a1583dd30880ccf5b4c105a237d6563f212e8 Reviewed-by: Thorbjørn Lund Martsum --- .../itemviews/qheaderview/tst_qheaderview.cpp | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp') diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index eacf2e51fd..b9bf42f67f 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1647,6 +1647,37 @@ void tst_QHeaderView::saveRestore() QVERIFY(s1 == s2); QVERIFY(!h2.restoreState(QByteArrayLiteral("Garbage"))); + + // QTBUG-40462 + // Setting from Qt4, where information about multiple sections were grouped together in one + // sectionItem object + QByteArray settings_qt4 = + QByteArray::fromHex("000000ff00000000000000010000000100000000010000000000000000000000000000" + "0000000003e80000000a0101000100000000000000000000000064ffffffff00000081" + "0000000000000001000003e80000000a00000000"); + QVERIFY(h2.restoreState(settings_qt4)); + int sectionItemsLengthTotal = 0; + for (int i = 0; i < h2.count(); ++i) + sectionItemsLengthTotal += h2.sectionSize(i); + QVERIFY(sectionItemsLengthTotal == h2.length()); + + // Buggy setting where sum(sectionItems) != length. Check false is returned and this corrupted + // state isn't restored + QByteArray settings_buggy_length = + QByteArray::fromHex("000000ff000000000000000100000000000000050100000000000000000000000a4000" + "000000010000000600000258000000fb0000000a010100010000000000000000000000" + "0064ffffffff00000081000000000000000a000000d30000000100000000000000c800" + "000001000000000000008000000001000000000000005c00000001000000000000003c" + "0000000100000000000002580000000100000000000000000000000100000000000002" + "580000000100000000000002580000000100000000000003c000000001000000000000" + "03e8"); + int old_length = h2.length(); + QByteArray old_state = h2.saveState(); + // Check setting is correctly recognized as corrupted + QVERIFY(!h2.restoreState(settings_buggy_length)); + // Check nothing has been actually restored + QVERIFY(h2.length() == old_length); + QVERIFY(h2.saveState() == old_state); } void tst_QHeaderView::defaultSectionSizeTest() -- cgit v1.2.3