diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 10:26:12 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 10:26:12 (GMT) |
| commit | 60aa66d3a48949f63b13b4fe4f3f68383a4087a8 (patch) | |
| tree | 505c45909d75a730af5ec2061b60c8075cf0c8bd /src/gui/text | |
| parent | 84c7f73e8405b7e89202a2d3dcab140a656d618a (diff) | |
| parent | 1d094129c0c3994df4e59cd9eda6981a7b131903 (diff) | |
| download | Qt-60aa66d3a48949f63b13b4fe4f3f68383a4087a8.zip Qt-60aa66d3a48949f63b13b4fe4f3f68383a4087a8.tar.gz Qt-60aa66d3a48949f63b13b4fe4f3f68383a4087a8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 5 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 87a73df..fceb401 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -332,6 +332,11 @@ bool QFontDatabase::removeApplicationFont(int handle) return false; } +bool QFontDatabase::removeAllApplicationFonts() +{ + return false; +} + bool QFontDatabase::supportsThreadedFontRendering() { return false; diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 92fb7de..eea196e 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -39,6 +39,11 @@ ** ****************************************************************************/ +#if _WIN32_WINNT < 0x0500 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + #include "qfontengine_p.h" #include "qtextengine_p.h" #include <qglobal.h> |