Add font family alias resolving to QPA

By default it doesn't do anything special, but for fontconfig font db
it will do some tricks to convert alias like serif to actualy font
family names like Times.

Change-Id: I73058d187a5422e6f93bc1b728cecdc0250d5e1e
Reviewed-on: http://codereview.qt-project.org/5984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

4 files changed, 18 insertions, 1 deletions

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index fa67dc1a8a..680f63edb3 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1131,7 +1131,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #  include "qfontdatabase_s60.cpp"
 #endif
 QT_END_INCLUDE_NAMESPACE
-#if !defined(Q_WS_X11)
+#if !defined(Q_WS_X11) && !defined(Q_WS_QPA)
 QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
 {
     return family;
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index fbee077ba7..4cd47da6b7 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -377,4 +377,9 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
     }
 }
 
+QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
+{
+    return QGuiApplicationPrivate::platformIntegration()->fontDatabase()->resolveFontFamilyAlias(family);
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index cedf481898..89bc05985d 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -373,6 +373,17 @@ QHash<QByteArray, QFont> QPlatformFontDatabase::defaultFonts() const
 }
 
 /*!
+    Resolve alias to actual font family names.
+
+    \since 5.0
+ */
+
+QString QPlatformFontDatabase::resolveFontFamilyAlias(const QString &family) const
+{
+    return family;
+}
+
+/*!
     \class QPlatformFontDatabase
     \brief The QPlatformFontDatabase class makes it possible to customize how fonts
     are discovered and how they are rendered
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h
index ad94b108da..901d8c2e6e 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.h
+++ b/src/gui/text/qplatformfontdatabase_qpa.h
@@ -99,6 +99,7 @@ public:
 
     virtual QFont defaultFont() const;
     virtual QHash<QByteArray, QFont> defaultFonts() const;
+    virtual QString resolveFontFamilyAlias(const QString &family) const;
 
     //callback
     static void registerQPF2Font(const QByteArray &dataArray, void *handle);