diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 09:25:42 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 09:45:18 (GMT) |
| commit | 0faab4442040fdfe3790e3c02808fd45993f0265 (patch) | |
| tree | b62b047e41b4d0066cb2059294f80a549215d6e8 /src/gui/text/qtextdocumentlayout.cpp | |
| parent | 18447df1d021cfed69472b867cb7593401be27a6 (diff) | |
| download | Qt-0faab4442040fdfe3790e3c02808fd45993f0265.zip Qt-0faab4442040fdfe3790e3c02808fd45993f0265.tar.gz Qt-0faab4442040fdfe3790e3c02808fd45993f0265.tar.bz2 | |
Compile when qreal != double
Compile fix for devices where qreals are floats.
Reviewed-by: Fabien Freling
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 22c6b8c..c0f3fb4 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -2513,7 +2513,7 @@ static inline void getLineHeightParams(const QTextBlockFormat &blockFormat, cons if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight || blockFormat.lineHeightType() == QTextBlockFormat::MinimumHeight) { *lineBreakHeight = *lineHeight; if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight) - *lineAdjustment = QFixed::fromReal(line.ascent() + qMax(line.leading(), 0.0)) - ((*lineHeight * 4) / 5); + *lineAdjustment = QFixed::fromReal(line.ascent() + qMax(line.leading(), qreal(0.0))) - ((*lineHeight * 4) / 5); else *lineAdjustment = QFixed::fromReal(line.height()) - *lineHeight; } |