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, 7 insertions, 1 deletions

diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp
index 331c16a..b36ff33 100644
--- a/src/plugins/platforms/vnc/qvncintegration.cpp
+++ b/src/plugins/platforms/vnc/qvncintegration.cpp
@@ -49,6 +49,7 @@
 #include <QtGui/QPainter>
 
 #include <QtCore/QTimer>
+#include "qgenericunixfontdatabase.h"
 
 QVNCScreen::QVNCScreen(QRect screenSize, int screenId)
         : QFbScreen::QFbScreen()
@@ -100,7 +101,7 @@ static void usage()
 }
 
 QVNCIntegration::QVNCIntegration(const QStringList& paramList)
-    : virtualDesktop(false)
+    : virtualDesktop(false), fontDb(new QGenericUnixFontDatabase())
 {
     int sizeX = defaultWidth();
     int sizeY = defaultHeight();
@@ -234,3 +235,8 @@ void QVNCIntegration::moveToScreen(QWidget *window, int screen)
     window->platformWindow()->setGeometry(window->geometry());  // this should be unified elsewhere
     newScreen->addWindow(static_cast<QFbWindow *>(window->platformWindow()));
 }
+
+QPlatformFontDatabase *QVNCIntegration::fontDatabase() const
+{
+    return fontDb;
+}