summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-15 13:16:03 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-15 13:16:03 (GMT)
commit0417dd8dacb8b6123df10c947af396bed1ade82f (patch)
treeaa2a198371202cfdb410a16dba7c7038545962e4
parent0ff40995a804709fc9f638fb86a3068990f79ab6 (diff)
parent5d8a1b95ceece54177c1bf8f8b855498d64c4118 (diff)
downloadQt-0417dd8dacb8b6123df10c947af396bed1ade82f.zip
Qt-0417dd8dacb8b6123df10c947af396bed1ade82f.tar.gz
Qt-0417dd8dacb8b6123df10c947af396bed1ade82f.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
-rw-r--r--tests/auto/qheaderview/tst_qheaderview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp
index 920231d..3286768 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/qheaderview/tst_qheaderview.cpp
@@ -1836,7 +1836,7 @@ void tst_QHeaderView::preserveHiddenSectionWidth()
model.insertRow(1);
view.showSection(2);
QCOMPARE(view.sectionSize(0), 100);
- QCOMPARE(view.sectionSize(1), 30);
+ QCOMPARE(view.sectionSize(1), view.defaultSectionSize());
QCOMPARE(view.sectionSize(2), 50);
}