diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-07-20 10:29:19 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-22 02:50:14 (GMT) |
| commit | cc9a1a316d29993ffbe9b36d923021e66e92a832 (patch) | |
| tree | eee66f03413291fd0d3de7c4d6e25ec5078f2ef8 /src/gui/text | |
| parent | 4710ae6730a5fbfc085fdc766a15b94f403f4d27 (diff) | |
| download | Qt-cc9a1a316d29993ffbe9b36d923021e66e92a832.zip Qt-cc9a1a316d29993ffbe9b36d923021e66e92a832.tar.gz Qt-cc9a1a316d29993ffbe9b36d923021e66e92a832.tar.bz2 | |
doc: Fix qdoc errors for text related files
QTextBlock::layoutDirection() doesn't exist, and the QStaticText
constructor no longer takes a size argument.
Task-number: QTBUG-12072
Reviewed-by: Fabien Freling
(cherry picked from commit 04bc2b1f37750a2afbb88521001758249a8df383)
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 91a6612..7dc4355 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -148,9 +148,7 @@ QStaticText::QStaticText() } /*! - Constructs a QStaticText object with the given \a text and bounded by the given \a size. - - If an invalid size is passed for \a size the text will be unbounded. + Constructs a QStaticText object with the given \a text. */ QStaticText::QStaticText(const QString &text) : data(new QStaticTextPrivate) diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index f386871..5fb3384 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1148,7 +1148,7 @@ int QTextBlock::charFormatIndex() const direction from the blocks content. Returns either Qt::LeftToRight or Qt::RightToLeft. - \sa QTextBlock::layoutDirection(), QString::isRightToLeft(), Qt::LayoutDirection + \sa QTextFormat::layoutDirection(), QString::isRightToLeft(), Qt::LayoutDirection */ Qt::LayoutDirection QTextBlock::textDirection() const { |