From d3bf214eb3b3bf3799c01860c11d39bf76c4fcdb Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Thu, 6 Aug 2009 11:49:44 +0200
Subject: Fix linking of applications that use
QFontDatabase::removeApplicationFont.
Application font support requires the platform to implement the private
registerFont() function, but it is also necessary to implement the public
QFontDatabase::removeApplicationFont() function in the platform fontdatabase.
The former is implemented as a stub, indicating an error to the caller. The
latter was missing as a stub, causing link errors in WebKit.
Reviewed-by: Jason Barron
---
src/gui/text/qfontdatabase_s60.cpp | 6 ++++++
1 file changed, 6 insertions(+)
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;
--
cgit v0.12