diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-04 15:47:13 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-08 08:21:25 (GMT) |
| commit | 5a598afa3f1928e9ad18257e2fa48fe3d5739917 (patch) | |
| tree | 8538d34912dbd453f1de05625565ed9f1a6b81aa /src/gui | |
| parent | 5ce3fbb67b79c3732fd47b296ef9421398ca520c (diff) | |
| download | Qt-5a598afa3f1928e9ad18257e2fa48fe3d5739917.zip Qt-5a598afa3f1928e9ad18257e2fa48fe3d5739917.tar.gz Qt-5a598afa3f1928e9ad18257e2fa48fe3d5739917.tar.bz2 | |
Fix compile when configure with no fontconfig support
Task-number: QTBUG-19716
Reviewed-by: Eskil
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qrawfont_ft.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qrawfont_ft.cpp b/src/gui/text/qrawfont_ft.cpp index e8c10a5..db60459 100644 --- a/src/gui/text/qrawfont_ft.cpp +++ b/src/gui/text/qrawfont_ft.cpp @@ -46,7 +46,7 @@ #include "qrawfont_p.h" #include "qfontengine_ft_p.h" -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG) # include "qfontengine_x11_p.h" #endif @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QFontEngineFTRawFont -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG) : public QFontEngineX11FT #else : public QFontEngineFT @@ -63,7 +63,7 @@ class QFontEngineFTRawFont { public: QFontEngineFTRawFont(const QFontDef &fontDef) -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG) : QFontEngineX11FT(fontDef) #else : QFontEngineFT(fontDef) |