diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-07 08:12:47 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-07 08:12:47 (GMT) |
| commit | 2ff6c9e8d89590c8180769bd54e545f40ca9a56f (patch) | |
| tree | 4c218c06f99ee31be79fb19a089d7506f29b373f /src/gui/text/qfontdatabase_qws.cpp | |
| parent | bd4771a8a135bf2307c6fb2e27ccdac64637992d (diff) | |
| download | Qt-2ff6c9e8d89590c8180769bd54e545f40ca9a56f.zip Qt-2ff6c9e8d89590c8180769bd54e545f40ca9a56f.tar.gz Qt-2ff6c9e8d89590c8180769bd54e545f40ca9a56f.tar.bz2 | |
Please welcome the Lighthouse Research Project!
Lighthouse is a lighter, nimbler version of Qt/Embedded, which does not
contain a window system. Instead, it uses graphics system plugins to
provide the necessary functionality or interface with existing window
systems.
The first version was written by Rhys.
Squashed commit.
Diffstat (limited to 'src/gui/text/qfontdatabase_qws.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_qws.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp index 0a9630f..62c67a3 100644 --- a/src/gui/text/qfontdatabase_qws.cpp +++ b/src/gui/text/qfontdatabase_qws.cpp @@ -40,8 +40,10 @@ ****************************************************************************/ #include "qdir.h" +#if defined(Q_WS_QWS) #include "qscreen_qws.h" //so we can check for rotation #include "qwindowsystem_qws.h" +#endif #include "qlibraryinfo.h" #include "qabstractfileengine.h" #include <QtCore/qsettings.h> @@ -153,7 +155,11 @@ extern QString qws_fontCacheDir(); #ifndef QT_FONTS_ARE_RESOURCES bool QFontDatabasePrivate::loadFromCache(const QString &fontPath) { +#ifdef Q_WS_QWS const bool weAreTheServer = QWSServer::instance(); +#else + const bool weAreTheServer = true; // assume single-process +#endif QString fontDirFile = fontPath + QLatin1String("/fontdir"); @@ -687,6 +693,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, { QScopedPointer<QFontEngine> engine(loadSingleEngine(script, fp, request, family, foundry, style, size)); +#ifndef QT_NO_QWS_QPF if (!engine.isNull() && script == QUnicodeTables::Common && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) { @@ -700,6 +707,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, engine.take(); engine.reset(fe); } +#endif return engine.take(); } |