AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile when configure with no fontconfig support

Browse Source 
Task-number: QTBUG-19716
Reviewed-by: Eskil
(cherry picked from commit 5a598afa3f1928e9ad18257e2fa48fe3d5739917)

Change-Id: I05107970e3273fce48303c9956e1c9aa928832b9
Reviewed-on: http://codereview.qt.nokia.com/376
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
This commit is contained in:
Jiang Jiang 2011-06-04 17:47:13 +02:00 committed by Qt Continuous Integration System
parent ed5a7e22be
commit d9e3d1a540
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qrawfont_ft.cpp
View File

@ -46,7 +46,7 @@
#include "qrawfont_p.h" #include "qrawfont_p.h"
#include "qfontengine_ft_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" # include "qfontengine_x11_p.h"
#endif #endif
@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QFontEngineFTRawFont class QFontEngineFTRawFont
#if defined(Q_WS_X11) #if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
: public QFontEngineX11FT : public QFontEngineX11FT
#else #else
: public QFontEngineFT : public QFontEngineFT
@ -63,7 +63,7 @@ class QFontEngineFTRawFont
{ {
public: public:
QFontEngineFTRawFont(const QFontDef &fontDef) QFontEngineFTRawFont(const QFontDef &fontDef)
#if defined(Q_WS_X11) #if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
: QFontEngineX11FT(fontDef) : QFontEngineX11FT(fontDef)
#else #else
: QFontEngineFT(fontDef) : QFontEngineFT(fontDef)