diff options
author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2009-11-20 12:40:34 (GMT) |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2009-11-20 12:42:58 (GMT) |
commit | 75d68b2b245da91ec9f985893f9b233d9d6a0793 (patch) | |
tree | c0381ea77f74c1a7b896517e16dcd340e10dad1e /src/gui/itemviews | |
parent | 5cf6f6276a3a9103876937c300c1adce157eebeb (diff) | |
download | Qt-75d68b2b245da91ec9f985893f9b233d9d6a0793.zip Qt-75d68b2b245da91ec9f985893f9b233d9d6a0793.tar.gz Qt-75d68b2b245da91ec9f985893f9b233d9d6a0793.tar.bz2 |
Q_ASSERT failure when resizing a span to (1,1) in 1st cell
Reviewed-by: Olivier
Task-number: QTBUG-6004
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r-- | src/gui/itemviews/qtableview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp index a3877b7..d27e693 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()) { |