summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-11 11:47:46 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-11 11:47:46 (GMT)
commit38809e24a48f6c4b148cd730a8d5d52a7525e5bd (patch)
treecdb99c093f737d5544051d779218f90b6298082a /src/gui/text
parent48257d751a76699e548e59b76fc79303ef328375 (diff)
parent92c5c75a9840853fad4f30235f9bf86dc7133fc4 (diff)
downloadQt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.zip
Qt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.tar.gz
Qt-38809e24a48f6c4b148cd730a8d5d52a7525e5bd.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtexttable.cpp7
1 files changed, 6 insertions, 1 deletions
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