diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2009-11-20 12:40:34 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-23 12:06:55 (GMT) |
| commit | e0f146f2048a6963cd57d5473ff6501e25ddfcd9 (patch) | |
| tree | 5a2b76df26a18544905ad5fd51c68fa5b82823aa | |
| parent | 553541157aa63a87e1ad14483c7dfd2a48b5d40e (diff) | |
| download | Qt-e0f146f2048a6963cd57d5473ff6501e25ddfcd9.zip Qt-e0f146f2048a6963cd57d5473ff6501e25ddfcd9.tar.gz Qt-e0f146f2048a6963cd57d5473ff6501e25ddfcd9.tar.bz2 | |
Q_ASSERT failure when resizing a span to (1,1) in 1st cell
Reviewed-by: Olivier
Task-number: QTBUG-6004
(cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)
| -rw-r--r-- | src/gui/itemviews/qtableview.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qtableview/tst_qtableview.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp index 3819ca7..a16b362 100644 --- a/src/gui/itemviews/qtableview.cpp +++ b/src/gui/itemviews/qtableview.cpp @@ -114,7 +114,7 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height) } } else if (old_height > span->height()) { //remove the span from all the subspans lists that intersect the columns not covered anymore - Index::iterator it_y = index.lowerBound(-span->bottom()); + Index::iterator it_y = index.lowerBound(qMin(-span->bottom(), 0)); Q_ASSERT(it_y != index.end()); //it_y must exist since the span is in the list while (-it_y.key() <= span->top() + old_height -1) { if (-it_y.key() > span->bottom()) { diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 375bcbd..b66d679 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -3015,6 +3015,14 @@ void tst_QTableView::spans_data() << QPoint(2, 0) << 1 << 2; + + QTest::newRow("QTBUG-6004: No failing Q_ASSERT, then it passes.") + << 5 << 5 + << (SpanList() << QRect(0, 0, 2, 2) << QRect(0, 0, 1, 1)) + << false + << QPoint(0, 0) + << 1 + << 1; } void tst_QTableView::spans() |