diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2010-09-02 15:37:07 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2010-09-02 15:37:24 (GMT) |
| commit | c229d4c1cb4c5aa0be22dddd5e8d8436a29cf103 (patch) | |
| tree | bc8537e6fec65c8964b34f194582c547f624b42f /src/gui/text | |
| parent | 5afd02d13fca42d556e03579a5ed4eb53d2eb172 (diff) | |
| download | Qt-c229d4c1cb4c5aa0be22dddd5e8d8436a29cf103.zip Qt-c229d4c1cb4c5aa0be22dddd5e8d8436a29cf103.tar.gz Qt-c229d4c1cb4c5aa0be22dddd5e8d8436a29cf103.tar.bz2 | |
Removing a left over #if 1..#endif construct
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont_s60.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp index ccd17a2..f303419 100644 --- a/src/gui/text/qfont_s60.cpp +++ b/src/gui/text/qfont_s60.cpp @@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE -#if 1 #ifdef QT_NO_FREETYPE Q_GLOBAL_STATIC(QMutex, lastResortFamilyMutex); #endif // QT_NO_FREETYPE @@ -70,7 +69,7 @@ QString QFont::lastResortFamily() const lock.relock(); } return family; -#else +#else // QT_NO_FREETYPE // For the FreeType case we just hard code the face name, since otherwise on // East Asian systems we may get a name for a stroke based (non-ttf) font. @@ -82,12 +81,6 @@ QString QFont::lastResortFamily() const return QLatin1String(isJapaneseOrChineseSystem?"Heisei Kaku Gothic S60":"Series 60 Sans"); #endif // QT_NO_FREETYPE } -#else // 0 -QString QFont::lastResortFamily() const -{ - return QLatin1String("Series 60 Sans"); -} -#endif // 0 QString QFont::defaultFamily() const { |