-rw-r--r-- | library/fontdatabase.cpp | 17 |
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 ) | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | QValueList<FontFactory> *FontDatabase::factoryList = 0; | ||
56 | 55 | ||
56 | QValueList<FontFactory> *FontDatabase::factoryList = 0; | ||
57 | /*! | 57 | /*! |
58 | \class FontDatabase fontdatabase.h | 58 | \class FontDatabase fontdatabase.h |
@@ -93,4 +93,9 @@ QStringList FontDatabase::families() const | |||
93 | return QFontDatabase::families(); | 93 | return QFontDatabase::families(); |
94 | #else | 94 | #else |
95 | |||
96 | #ifndef QWS | ||
97 | QStringList list; | ||
98 | return list; | ||
99 | #else | ||
95 | QStringList list; | 100 | QStringList list; |
96 | QDict<void> familyDict; | 101 | QDict<void> familyDict; |
@@ -116,4 +121,5 @@ QStringList FontDatabase::families() const | |||
116 | return list; | 121 | return list; |
117 | #endif | 122 | #endif |
123 | #endif | ||
118 | } | 124 | } |
119 | 125 | ||
@@ -145,4 +151,8 @@ QValueList<int> FontDatabase::standardSizes() | |||
145 | void FontDatabase::loadRenderers() | 151 | void FontDatabase::loadRenderers() |
146 | { | 152 | { |
153 | #ifndef QWS | ||
154 | return; | ||
155 | #else | ||
156 | |||
147 | #ifndef QT_NO_COMPONENT | 157 | #ifndef QT_NO_COMPONENT |
148 | if ( !factoryList ) | 158 | if ( !factoryList ) |
@@ -184,4 +194,5 @@ void FontDatabase::loadRenderers() | |||
184 | } | 194 | } |
185 | #endif | 195 | #endif |
196 | #endif | ||
186 | } | 197 | } |
187 | 198 | ||
@@ -191,4 +202,7 @@ void FontDatabase::loadRenderers() | |||
191 | void FontDatabase::readFonts( QFontFactory *factory ) | 202 | void FontDatabase::readFonts( QFontFactory *factory ) |
192 | { | 203 | { |
204 | #ifndef QWS | ||
205 | return; | ||
206 | #else | ||
193 | // Load in font definition file | 207 | // Load in font definition file |
194 | QString fn = fontDir() + "fontdir"; | 208 | QString fn = fontDir() + "fontdir"; |
@@ -231,4 +245,5 @@ void FontDatabase::readFonts( QFontFactory *factory ) | |||
231 | } | 245 | } |
232 | fclose(fontdef); | 246 | fclose(fontdef); |
247 | #endif | ||
233 | } | 248 | } |
234 | 249 | ||