diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-22 13:09:33 +0200 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-22 13:09:33 +0200 |
| commit | d1f25aad71725b66ddcac52d84999d592ad4d132 (patch) | |
| tree | 40eab0cb0969271e7b458da90d934d71df715511 /src/gui/text/qfontdatabase.cpp | |
| parent | 500f8a4368be85a0ae8b7c46012deb0ab0c844ad (diff) | |
| parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
Merge remote branch 'mainline/4.8'
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 4e667a4612..79503f9bf6 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1130,13 +1130,14 @@ QT_BEGIN_INCLUDE_NAMESPACE #elif defined(Q_OS_SYMBIAN) # include "qfontdatabase_s60.cpp" #endif +QT_END_INCLUDE_NAMESPACE + #if !defined(Q_WS_X11) QString QFontDatabase::resolveFontFamilyAlias(const QString &family) { return family; } #endif -QT_END_INCLUDE_NAMESPACE static QtFontStyle *bestStyle(QtFontFoundry *foundry, const QtFontStyle::Key &styleKey, const QString &styleName = QString()) |