summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-05-27 19:16:10 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-05-31 16:22:55 (GMT)
commit33fddc2adf95b56d8309ef9bc11408252140a085 (patch)
tree33dc98adbaa3959cf44e75c5b2d9a07d056e2ba5 /src/gui/text
parent3cc9fc5f0c5e846dcc1ce2e7c6e58c06e1186363 (diff)
downloadQt-33fddc2adf95b56d8309ef9bc11408252140a085.zip
Qt-33fddc2adf95b56d8309ef9bc11408252140a085.tar.gz
Qt-33fddc2adf95b56d8309ef9bc11408252140a085.tar.bz2
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index d34553f..6359672 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -885,7 +885,7 @@ void QTextEngine::shapeText(int item) const
QFixed letterSpacing = font.d->letterSpacing;
QFixed wordSpacing = font.d->wordSpacing;
- if (letterSpacingIsAbsolute)
+ if (letterSpacingIsAbsolute && letterSpacing.value())
letterSpacing *= font.d->dpi / qt_defaultDpiY();
if (letterSpacing != 0) {