| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
When you're inserting a column in front of a rowspanned cell
and this cell is not the first in the rowspan, we would get
the wrong logical index of the new cell (putting it in
front of the initial cell with the rowspan). If the cell
does not span all rows, the table will get into a broken state
and trigger asserts in update(). To fix this, we search for
the first cell after the insertion point which has a logical
index higher than the cell directly before the insertion point.
Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |\
| |
| |
| |
| | |
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3.
Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding
fails on mac and Linux, reverting for now.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
