summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-06 11:02:32 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-06 11:02:32 (GMT)
commit1b7d4d29d970405d5559c5641260ea1f09375b27 (patch)
tree20108a23a7cc1380ad8eddff50cb627d9af40bcf /src/gui/text
parente5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (diff)
parentd3bf214eb3b3bf3799c01860c11d39bf76c4fcdb (diff)
downloadQt-1b7d4d29d970405d5559c5641260ea1f09375b27.zip
Qt-1b7d4d29d970405d5559c5641260ea1f09375b27.tar.gz
Qt-1b7d4d29d970405d5559c5641260ea1f09375b27.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-origin
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase_s60.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index 8176009..ae84eeb 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -287,6 +287,12 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
Q_UNUSED(fnt);
}
+bool QFontDatabase::removeApplicationFont(int handle)
+{
+ Q_UNUSED(handle);
+ return false;
+}
+
bool QFontDatabase::supportsThreadedFontRendering()
{
return false;