diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 11:47:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 11:47:46 (GMT) |
| commit | 38809e24a48f6c4b148cd730a8d5d52a7525e5bd (patch) | |
| tree | cdb99c093f737d5544051d779218f90b6298082a /src/gui | |
| parent | 48257d751a76699e548e59b76fc79303ef328375 (diff) | |
| parent | 92c5c75a9840853fad4f30235f9bf86dc7133fc4 (diff) | |
| download | Qt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.zip Qt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.tar.gz Qt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qtexttable.cpp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index a5cfbbd..4744f14 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7159,14 +7159,14 @@ QPoint QPainter::xFormDev(const QPoint &p) const \fn QRect QPainter::xFormDev(const QRect &rectangle) const \overload - Use combineMatrix() combined with QMatrix::inverted() instead. + Use mapRect() combined with QMatrix::inverted() instead. \oldcode QPainter painter(this); QRect transformed = painter.xFormDev(rectangle); \newcode QPainter painter(this); - QRect transformed = rectangle * painter.combinedMatrix().inverted(); + QRect transformed = painter.combinedMatrix().inverted(rectangle); \endcode */ diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index ba1c04f..48708c9 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -525,7 +525,12 @@ void QTextTablePrivate::update() const Rows and columns within a QTextTable can be merged and split using the mergeCells() and splitCell() functions. However, only cells that span multiple rows or columns can be split. (Merging or splitting does not increase or decrease - the number of rows and columns.) + the number of rows and columns.) + + Note that if you have merged multiple columns and rows into one cell, you will not + be able to split the merged cell into new cells spanning over more than one row + or column. To be able to split cells spanning over several rows and columns you + need to do this over several iterations. \table 80% \row |