diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-25 11:21:53 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:08:03 +0200 |
| commit | 6fe12b0e80b95775b1daa201ea601e537c600286 (patch) | |
| tree | 9d71f16a5ee48faee8e94db217f240066b1c6185 /src/gui | |
| parent | ef913833245f8401b9652a4f58bbb26735526180 (diff) | |
Fix QFontEngineX11FT compilation
xglyph_format is only available when XRender is present.
Reviewed-by: Fabien Freling
(cherry picked from commit a6642e4659b3d45ffa94f9a3c6413124d49f2b91)
Change-Id: Ibd767c5055c8fb4a7d28ace141f6713f4367d1ba
Reviewed-on: http://codereview.qt.nokia.com/113
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_x11.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index 099704894c..e3bfa5df46 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; } } |