diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:13:50 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:21:19 +0200 |
commit | abd3b8030cbcc50379578b88ce6019e338ff8597 (patch) | |
tree | 7a7acb89e594b57180e9823c4ab03dcce66d5b5f /src/gui/text/qtextlayout.cpp | |
parent | 5cb581b3b4c3305a0dfebead1ec7049ab6f2ebc4 (diff) | |
parent | 6f3bb0aafab877c34dea3d9141a9931b5a7914a5 (diff) |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/widgets.pro
Change-Id: I697eec936c4e1a6c360edc8f0b472e23c0461ecb
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
-rw-r--r-- | src/gui/text/qtextlayout.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 435ef2637d..9919ce6bb4 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -108,6 +108,10 @@ QT_BEGIN_NAMESPACE This class is only used if the text layout is used to lay out parts of a QTextDocument. + Normally, you do not need to create a QTextInlineObject. It is + used by QAbstractTextDocumentLayout to handle inline objects when + implementing a custom layout. + The inline object has various attributes that can be set, for example using, setWidth(), setAscent(), and setDescent(). The rectangle it occupies is given by rect(), and its direction by @@ -117,6 +121,7 @@ QT_BEGIN_NAMESPACE /*! \fn QTextInlineObject::QTextInlineObject(int i, QTextEngine *e) + \internal Creates a new inline object for the item at position \a i in the text engine \a e. |