diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 02:41:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 02:41:42 (GMT) |
| commit | 662666a5d4d114f91dbed8cbe3ce46fddfe3c82b (patch) | |
| tree | 0b72d67d46bf1693e1b3e2b8669fef8c8c89e766 /src/gui/text | |
| parent | 35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff) | |
| parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
| download | Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.zip Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.gz Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 3 | ||||
| -rw-r--r-- | src/gui/text/qtextoption.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 9343cb7..c000457 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -357,9 +357,6 @@ void QFontEngine::getGlyphPositions(const QGlyphLayout &glyphs, const QTransform ++i; } } else { - positions.resize(glyphs.numGlyphs); - glyphs_out.resize(glyphs.numGlyphs); - int i = 0; while (i < glyphs.numGlyphs) { if (!glyphs.attributes[i].dontPrint) { QFixed gpos_x = xpos + glyphs.offsets[i].x; diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 0c8aeec..c1e254c 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -52,6 +52,9 @@ struct QTextOptionPrivate /*! Constructs a text option with default properties for text. + The text alignment property is set to Qt::AlignLeft. The + word wrap property is set to QTextOption::WordWrap. The + using of design metrics flag is set to false. */ QTextOption::QTextOption() : align(Qt::AlignLeft), @@ -67,6 +70,8 @@ QTextOption::QTextOption() /*! Constructs a text option with the given \a alignment for text. + The word wrap property is set to QTextOption::WordWrap. The using + of design metrics flag is set to false. */ QTextOption::QTextOption(Qt::Alignment alignment) : align(alignment), |