summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-10-23 17:31:11 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-10-23 17:31:11 (GMT)
commit076ab884591448cae5f029683401722e417a7c9c (patch)
tree535109354a95d0e711f8eca957fb57a94aca3a5e
parent36fc92485e9d627a925c66ca313a64a0ee6881bd (diff)
downloadQt-076ab884591448cae5f029683401722e417a7c9c.zip
Qt-076ab884591448cae5f029683401722e417a7c9c.tar.gz
Qt-076ab884591448cae5f029683401722e417a7c9c.tar.bz2
Compile on QWS
After 04d18b38c38c5ff623b30366ea08d56128b9b7d0 Qt didn't compile for QWS. Will email original committer to verify that original intent is maintained. Reviewed-by: Donald Carr <donald.carr@nokia.com>
-rw-r--r--src/gui/text/qfontengine_qpf.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index ef3f2ae..6ff0fbd 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -819,7 +819,7 @@ FT_Face QFontEngineQPF::lockFace() const
FT_Face face = freetype->face;
// ### not perfect
- const int ysize = fontDef.pixelSize << 6;
+ const int ysize = int(fontDef.pixelSize) << 6;
const int xsize = ysize;
if (freetype->xsize != xsize || freetype->ysize != ysize) {