Some ugly ifdefs inside fontdatabase for now :(

This temp. helps the x11 port

1 files changed, 16 insertions, 1 deletions

diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index 899d5cf..c7a5211 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -53,6 +53,6 @@ static QString fontFamily( const QString& key )
 #endif
 
-QValueList<FontFactory> *FontDatabase::factoryList = 0;
 
+QValueList<FontFactory> *FontDatabase::factoryList = 0;
 /*!
   \class FontDatabase fontdatabase.h
@@ -93,4 +93,9 @@ QStringList FontDatabase::families() const
     return QFontDatabase::families();
 #else
+
+#ifndef QWS
+   QStringList list;
+   return list;
+#else
     QStringList list;
     QDict<void> familyDict;
@@ -116,4 +121,5 @@ QStringList FontDatabase::families() const
     return list;
 #endif
+#endif
 }
 
@@ -145,4 +151,8 @@ QValueList<int> FontDatabase::standardSizes()
 void FontDatabase::loadRenderers()
 {
+#ifndef QWS
+    return;
+#else
+
 #ifndef QT_NO_COMPONENT
     if ( !factoryList )
@@ -184,4 +194,5 @@ void FontDatabase::loadRenderers()
     }
 #endif
+#endif
 }
 
@@ -191,4 +202,7 @@ void FontDatabase::loadRenderers()
 void FontDatabase::readFonts( QFontFactory *factory )
 {
+#ifndef QWS
+return;
+#else
     // Load in font definition file
     QString fn = fontDir() + "fontdir";
@@ -231,4 +245,5 @@ void FontDatabase::readFonts( QFontFactory *factory )
     }
     fclose(fontdef);
+#endif
 }