diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 14:50:43 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 14:50:43 (GMT) |
| commit | e40d3cedcf29b89998ffc81f959b2b8523989394 (patch) | |
| tree | 9c22c14049d67a9c4dc65675bb732366edb0af28 /src/gui/text/qfontdatabase.cpp | |
| parent | 1a7da7096bbda17197738061902f4489af234bc0 (diff) | |
| parent | a5b11b9031f9a2a97b65e9a6134244249845491a (diff) | |
| download | Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.zip Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.tar.gz Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index d3020b0..9c3c4a4 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -827,6 +827,7 @@ static void getEngineData(const QFontPrivate *d, const QFontCache::Key &key) d->engineData->ref.ref(); } } +#endif static QStringList familyList(const QFontDef &req) { @@ -855,7 +856,6 @@ static QStringList familyList(const QFontDef &req) return family_list; } -#endif Q_GLOBAL_STATIC(QFontDatabasePrivate, privateDb) Q_GLOBAL_STATIC_WITH_ARGS(QMutex, fontDatabaseMutex, (QMutex::Recursive)) |