summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-10-26 00:33:38 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-10-26 00:35:15 (GMT)
commit0d6104d763f4cb32ac6117b3f951afcb73fc50e6 (patch)
treed13455fbce9d45826918b23b656fa231b308ac97 /src
parent9aa00de1d277763c0f7a380fde27face60e5f686 (diff)
downloadQt-0d6104d763f4cb32ac6117b3f951afcb73fc50e6.zip
Qt-0d6104d763f4cb32ac6117b3f951afcb73fc50e6.tar.gz
Qt-0d6104d763f4cb32ac6117b3f951afcb73fc50e6.tar.bz2
Make compile on X11 systems where qreal == float
Reviewed-by: Sarah Smith
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qfontdatabase_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index b582e4a..f184811 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -1456,7 +1456,7 @@ void qt_addPatternProps(FcPattern *pattern, int screen, int script, const QFontD
slant_value = FC_SLANT_OBLIQUE;
FcPatternAddInteger(pattern, FC_SLANT, slant_value);
- double size_value = qMax(1., request.pixelSize);
+ double size_value = qMax(qreal(1.), request.pixelSize);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
int stretch = request.stretch;