summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
diff options
context:
space:
mode:
authorjian liang <jianliang79@gmail.com>2012-03-13 22:52:51 +0800
committerQt by Nokia <qt-info@nokia.com>2012-03-14 09:45:07 +0100
commit255079124a5378c71ec25726eee9ba3d648c56c6 (patch)
treeae60787dbb75ec188da88b9428a21270ee25b483 /src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
parent9a68dd015674a6c23764640977d83c272336d9c7 (diff)
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h')
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase_ft.h3
1 files changed, 1 insertions, 2 deletions
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);