Don't hardcode the default families in qfont_qpa.cpp

Since different platforms come with different fonts, we should
probably leave it up to the platform to decide which family to use.

Change-Id: I18bb81c0ce87cc7e9ac7f3abaeae1b41c0ce8410
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

1 files changed, 6 insertions, 29 deletions

diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp
index 6576f237c4..b73b03025b 100644
--- a/src/gui/text/qfont_qpa.cpp
+++ b/src/gui/text/qfont_qpa.cpp
@@ -75,35 +75,12 @@ void QFont::setRawName(const QString &)
 
 QString QFont::defaultFamily() const
 {
-    QString familyName;
-    switch(d->request.styleHint) {
-        case QFont::SansSerif:
-            familyName = QString::fromLatin1("sans-serif");
-            break;
-        case QFont::Serif:
-            familyName = QString::fromLatin1("serif");
-            break;
-        case QFont::TypeWriter:
-        case QFont::Monospace:
-            familyName = QString::fromLatin1("monospace");
-            break;
-        case QFont::Cursive:
-            familyName = QString::fromLatin1("cursive");
-            break;
-        case QFont::Fantasy:
-            familyName = QString::fromLatin1("fantasy");
-            break;
-        case QFont::Decorative:
-            familyName = QString::fromLatin1("decorative");
-            break;
-        case QFont::System:
-        default:
-            familyName = QString();
-            break;
-    }
-
-    return QGuiApplicationPrivate::platformIntegration()->fontDatabase()->resolveFontFamilyAlias(familyName);
-
+    QPlatformFontDatabase *fontDB = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
+    const QStringList fallbacks = fontDB->fallbacksForFamily(QString(), QFont::StyleNormal
+                                      , QFont::StyleHint(d->request.styleHint), QUnicodeTables::Common);
+    if (!fallbacks.isEmpty())
+        return fallbacks.first();
+    return QString();
 }
 
 QString QFont::lastResortFamily() const