summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtexttable
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+56
|\ | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * Fix an Assert in QTextTablePierre Rossi2010-07-141-0/+55
| | | | | | | | | | | | | | | | | | The problem was caused by the fragment id being inserted in front of a cell spanning over several rows instead of the next logical cell (or fragment_end) in the cells structure. Task-number: QTBUG-11282 Reviewed-by: Simon Hausmann
| * Revert "Fix an Assert in QTextTable"Aaron McCarthy2010-07-141-54/+0
| | | | | | | | | | | | | | This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3. Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding fails on mac and Linux, reverting for now.
| * Fix an Assert in QTextTablePierre Rossi2010-07-131-0/+54
| | | | | | | | | | | | | | | | | | The problem was caused by the fragment id being inserted in front of a cell spanning over several rows instead of the next logical cell (or fragment_end) in the cells structure. Task-number: QTBUG-11282 Reviewed-by: Simon Hausmann
* | Fix crash when removing columns in merged rowEskil Abrahamsen Blomfeldt2010-07-071-0/+14
|/ | | | | | | | | | | | | | | | Change 4b709b41f5a7ae8dc6e537b644158f5201ce0a98 tried to make sure that rows with merged cells would not be completely removed, as this would cause a crash. However, when removing just a few columns from a merged cell, the span of the cell should be reduced by the number of columns removed. The "touched" guard would cause the span to be decreased a maximum of one time, regardless of how many columns were removed, leaving the table in an invalid state, as the column count would be smaller than the span of the cell. This would assert later on. To avoid this, we only guard against removal, not against decreasing the span. Task-number: QTBUG-11646 Reviewed-by: Thomas Zander
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-08-111-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-233-0/+941