diff options
| author | jian liang <jianliang79@gmail.com> | 2012-03-13 22:52:51 +0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 09:45:07 +0100 |
| commit | 255079124a5378c71ec25726eee9ba3d648c56c6 (patch) | |
| tree | ae60787dbb75ec188da88b9428a21270ee25b483 /src/plugins/platforms/windows/qwindowsfontdatabase.h | |
| parent | 9a68dd015674a6c23764640977d83c272336d9c7 (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.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index 04d6ccdd91..f8f2a1eb85 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -85,7 +85,8 @@ public: virtual void releaseHandle(void *handle); virtual QString fontDir() const; - virtual QFont defaultFont() const; + virtual QFont defaultFont() const { return systemDefaultFont(); } + static QFont systemDefaultFont(); static QFontEngine *createEngine(int script, const QFontDef &request, HDC fontHdc, int dpi, bool rawMode, |