Initial pluggable fontdatabase

QPlatformFontDatabase added. QPlatformIntegration now has a new virtual
function: QPlatformDatabase::fontDatabase() const. Most unix platform
plugins wants to follow the pattern implemented in directfb, linuxfb,
vnc etc. In the pro file do:
include(../fontdatabases/genericunix/genericunix.pri)

In the QPlatformIntegration class do:

and instansiate a QGenericFontDatabase in the constructor and return
it in the getter function.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/platforms/qvfb/qvfbintegration.cpp b/src/plugins/platforms/qvfb/qvfbintegration.cpp
index a50763a..0cc3938 100644
--- a/src/plugins/platforms/qvfb/qvfbintegration.cpp
+++ b/src/plugins/platforms/qvfb/qvfbintegration.cpp
@@ -62,6 +62,8 @@
 #include <QApplication>
 #include <QWindowSystemInterface>
 
+#include "qgenericunixfontdatabase.h"
+
 QT_BEGIN_NAMESPACE
 
 
@@ -409,6 +411,7 @@ QImage *QVFbScreen::screenImage()
 }
 
 QVFbIntegration::QVFbIntegration(const QStringList &paramList)
+    : mFontDb(new QGenericUnixFontDatabase())
 {
     int displayId = 0;
     if (paramList.length() > 0)
@@ -435,6 +438,11 @@ QPlatformWindow *QVFbIntegration::createPlatformWindow(QWidget *widget, WId) con
     return new QVFbWindow(mPrimaryScreen, widget);
 }
 
+QPlatformFontDatabase *QVFbIntegration::fontDatabase() const
+{
+    return mFontDb;
+}
+
 QT_END_NAMESPACE
 
 #include "qvfbintegration.moc"