From 255079124a5378c71ec25726eee9ba3d648c56c6 Mon Sep 17 00:00:00 2001 From: jian liang Date: Tue, 13 Mar 2012 22:52:51 +0800 Subject: build fix for -no-freetype in Windows Don't use QWindowsFontDatabaseFT::systemDefaultFont() and QWindowsFontDatabaseFT::LOGFONT_to_QFont() in qwindowsfontdatabase.cpp and qwindowstheme.cpp because it is not available when building with -no-freetype. Change-Id: I11075475ff435c55b0c641540f95a4d3861b79da Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h') diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h index 4136b75dd8..24810c9202 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h @@ -59,8 +59,7 @@ public: QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); virtual QString fontDir() const; - virtual QFont defaultFont() const { return systemDefaultFont(); } - static QFont systemDefaultFont(); + virtual QFont defaultFont() const; static HFONT systemFont(); static QFont LOGFONT_to_QFont(const LOGFONT& lf, int verticalDPI = 0); -- cgit v1.2.3