summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@nokia.com>2010-09-28 13:05:03 (GMT)
committerAlessandro Portale <alessandro.portale@nokia.com>2010-09-28 13:05:03 (GMT)
commit1341477e03dae2f9bc5ddb25beeb2ba3cd23358f (patch)
tree874527d55bb27fea9ed979dff7426d77e9a860e5 /src/gui/text
parent3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79 (diff)
downloadQt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.zip
Qt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.tar.gz
Qt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.tar.bz2
Implemeting, exporting and autotesting QFont::lastResortFont()
An implementation of QFont::lastResortFont() is still(!) missing in Qt 4.7.0. I only became aware of QTBUG-6921, lately. This patch... 1) implements QFont::lastResortFont() in qfont_s60.cpp by first trying to get the lastResortFamily() and then falling back to a hardcoded font. 2) updates the .def files with one additional entry 3) adds an autotest which verifies that lastResortFamily() does return a non-empty string. In the firt place, that autotest makes sure that lastResortFamily() is implemented and exported, so that something like this issue will not go unnoticed in the next Qt port. Task-number: QTBUG-6921 Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfont_s60.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
index d39f30a..80a3bb2 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/text/qfont_s60.cpp
@@ -57,6 +57,16 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, fontFamiliesOnFontServer, {
});
#endif // QT_NO_FREETYPE
+QString QFont::lastResortFont() const
+{
+ // Symbian's font Api does not distinguish between font and family.
+ // Therefore we try to get a "Family" first, then fall back to "Sans".
+ static QString font = lastResortFamily();
+ if (font.isEmpty())
+ font = QLatin1String("Sans");
+ return font;
+}
+
QString QFont::lastResortFamily() const
{
#ifdef QT_NO_FREETYPE