diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
| commit | 6001ef3bb9cdf41c5375a22cdaee85fffdf3b644 (patch) | |
| tree | f37a69fc24d84522a0cb388802a38022a3cd9943 /src/gui/text | |
| parent | d1a28d167295958a4404fab37d60ef530c692590 (diff) | |
| parent | d7b34583926e3bd751120a4b827cd5ba6667dea3 (diff) | |
| download | Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.zip Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.gz Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.bz2 | |
Merge commit 'oslo-staging-1/4.6' into master-mainline
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 808dca6..bf8af92 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -51,6 +51,9 @@ #include <private/qcore_symbian_p.h> #if defined(QT_NO_FREETYPE) #include <OPENFONT.H> +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS +#include <graphics/openfontrasterizer.h> // COpenFontRasterizer has moved to a new header file +#endif // SYMBIAN_ENABLE_SPLIT_HEADERS #endif QT_BEGIN_NAMESPACE |