summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtexttable.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-05-13 13:22:21 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-05-13 13:22:21 (GMT)
commitf15352c51625688ec445c73125a2e25327377d49 (patch)
tree0d7d82d8ea8ffeff5cf042cd70af3200ec6f1925 /src/gui/text/qtexttable.cpp
parentc8c5becc81679eb8a9a0f8baa454bc43fd3cccf9 (diff)
parent0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (diff)
downloadQt-f15352c51625688ec445c73125a2e25327377d49.zip
Qt-f15352c51625688ec445c73125a2e25327377d49.tar.gz
Qt-f15352c51625688ec445c73125a2e25327377d49.tar.bz2
Merge commit 'qt/master'
Diffstat (limited to 'src/gui/text/qtexttable.cpp')
-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