summaryrefslogtreecommitdiff
path: root/qtquickcontrols.pro
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2013-04-05 10:09:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 10:22:07 +0200
commita077d075eafa947b48cf0824146d8dc6873b10ed (patch)
tree39e8c5728ecc99d9c148e50d37d4951fa3c53c57 /qtquickcontrols.pro
parentfe95db7685ed943a73a5de127b3f587e42f682ff (diff)
downloadqtquickcontrols-a077d075eafa947b48cf0824146d8dc6873b10ed.tar.gz
Fixed a bug where spans across empty cells got broken.
If a row/column is only used only because of the spanning of an item, the cell should be treated as it didn't exist. We keep track of this with the "ignore" bit array. The old code would always start from the row/column at position 1. In the attached testcase this made the effectiveRowSpan become larger than actually needed. Task-number: QTBUG-30255 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Change-Id: I410ed373f408014333d3964e2ddbcfeb25bec3a6 (cherry picked from qtbase/4f072e2d3d7e429359ff15a615d02712bff7ee51) Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'qtquickcontrols.pro')
0 files changed, 0 insertions, 0 deletions