summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontmetrics.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/text/qfontmetrics.cpp')
-rw-r--r--src/gui/text/qfontmetrics.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index a2f0dd724a..283494e316 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -288,7 +288,7 @@ int QFontMetrics::height() const
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
- return qRound(engine->ascent()) + qRound(engine->descent()) + 1;
+ return qRound(engine->ascent()) + qRound(engine->descent());
}
/*!
@@ -316,7 +316,7 @@ int QFontMetrics::lineSpacing() const
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
- return qRound(engine->leading()) + qRound(engine->ascent()) + qRound(engine->descent()) + 1;
+ return qRound(engine->leading()) + qRound(engine->ascent()) + qRound(engine->descent());
}
/*!
@@ -1147,7 +1147,7 @@ qreal QFontMetricsF::height() const
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
- return (engine->ascent() + engine->descent() + 1).toReal();
+ return (engine->ascent() + engine->descent()).toReal();
}
/*!
@@ -1175,7 +1175,7 @@ qreal QFontMetricsF::lineSpacing() const
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
- return (engine->leading() + engine->ascent() + engine->descent() + 1).toReal();
+ return (engine->leading() + engine->ascent() + engine->descent()).toReal();
}
/*!