diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
| commit | 9878c1765332d9a68a8371b90888fe09e272c7a8 (patch) | |
| tree | a67a7a28f6737b17498a76bcc40d5ffd65e81572 /src/gui/text/qtextlayout.cpp | |
| parent | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (diff) | |
| parent | b52da4ab2179079a6aff95891786d2f6598048b5 (diff) | |
| download | Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.zip Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.gz Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index da43913..7d5fa43 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1952,7 +1952,9 @@ void QTextLine::layout_helper(int maxGlyphs) // expand the text beyond the edge. if (sb_or_ws|breakany) { QFixed rightBearing = lbh.rightBearing; // store previous right bearing +#if !defined(Q_WS_MAC) if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width) +#endif lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { // we are too wide, fix right bearing |