summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_x11.cpp
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-05-25 09:21:53 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2011-05-25 09:27:26 (GMT)
commita6642e4659b3d45ffa94f9a3c6413124d49f2b91 (patch)
tree374bc773169bba9ca96e7e664e8ec6dfabf8e68e /src/gui/text/qfontengine_x11.cpp
parent2552c99cfeaaba44db77467bf50176173ff14457 (diff)
downloadQt-a6642e4659b3d45ffa94f9a3c6413124d49f2b91.zip
Qt-a6642e4659b3d45ffa94f9a3c6413124d49f2b91.tar.gz
Qt-a6642e4659b3d45ffa94f9a3c6413124d49f2b91.tar.bz2
Fix QFontEngineX11FT compilation
xglyph_format is only available when XRender is present. Reviewed-by: Fabien Freling
Diffstat (limited to 'src/gui/text/qfontengine_x11.cpp')
-rw-r--r--src/gui/text/qfontengine_x11.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index 4260b85..9775e10 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -1205,7 +1205,9 @@ QFontEngine *QFontEngineX11FT::cloneWithSize(qreal pixelSize) const
delete fe;
return 0;
} else {
+#ifndef QT_NO_XRENDER
fe->xglyph_format = xglyph_format;
+#endif
return fe;
}
}