diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 19:19:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 19:19:36 (GMT) |
| commit | 07f131927faa09402589da7b4bfb516482f59e46 (patch) | |
| tree | 9b1c7fdec802bbcb9b183d5644d02d8cc4435da2 /src/gui/text | |
| parent | 19924c1373e6acdf4ebf8cf61c51f3cdf32978b3 (diff) | |
| parent | d00d1bd5423d0bbfea7c85a0411d2b22d97fbe0f (diff) | |
| download | Qt-07f131927faa09402589da7b4bfb516482f59e46.zip Qt-07f131927faa09402589da7b4bfb516482f59e46.tar.gz Qt-07f131927faa09402589da7b4bfb516482f59e46.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use aligned load for the blending of RGB32 over RGB32
tst_moc: workaround gcc bug.
Some more change to the changelog
Fix compilation with QT_NO_GRAPHICSVIEW
Updates changes-4.7.0
Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.
Add a missing file in the config.test for SSE 4.2
Remove the masking when computing qAlpha()
Add support for more vector instructions on x86
Workaround gcc bug, disable test with old version of gcc
Do not crash due to a infinite recursion when using voiceover on MacOS
doc: Fix qdoc errors for text related files
QGraphicsItem: Animation leaves drawing artifacts when clipping is used.
moc: Slot with complex template default value does not compile
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 ab518d0..f6daed8 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 { |