diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-24 21:10:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-24 22:37:52 +0200 |
| commit | a1d2bf257e5240aadcd0d3b95f04ee2c86925b88 (patch) | |
| tree | 874e4cc617fdae7e558a1ee653b9e2fbf3df1ad2 /src/gui/text/qtextlayout.cpp | |
| parent | 223f5c0273452b1ccd48b6f1057598f507a1b2b9 (diff) | |
| parent | abd3b8030cbcc50379578b88ce6019e338ff8597 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
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. |