diff options
| author | Yoann Lopes <yoann.lopes@nokia.com> | 2011-02-02 16:57:39 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@nokia.com> | 2011-02-02 16:57:39 +0100 |
| commit | 2fc0d4ca43afb4072e92fd15648285c2c26d9da1 (patch) | |
| tree | 097d06bc9ac5512dd9431ad2be1b4eee0c47048d /src/gui/text/qfontdatabase_s60.cpp | |
| parent | e0a4c25a2276b998bc1514073bbe68d1eefb4345 (diff) | |
| parent | cf3420c698a0713bf32a4c18ccd7c145cbf581f3 (diff) | |
Merge branch 'integration'
Conflicts:
src/gui/kernel/qapplication_s60.cpp
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 97426a8b59..6d3970eb8a 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -464,6 +464,7 @@ void QFontEngineMultiS60::loadEngine(int at) Q_ASSERT(engines[at]); } +#ifdef QT_NO_FREETYPE static bool registerScreenDeviceFont(int screenDeviceFontIndex, const QSymbianFontDatabaseExtrasImplementation *dbExtras) { @@ -525,6 +526,7 @@ static bool registerScreenDeviceFont(int screenDeviceFontIndex, family->writingSystems[system] = QtFontFamily::Supported; return true; } +#endif static void initializeDb() { |