Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f

2 files changed, 31 insertions, 6 deletions

diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
index 43e04a006f..37868dcfde 100644
--- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qfontdatabase
 SOURCES  += tst_qfontdatabase.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
 QT += testlib
 !mac: QT += core-private gui-private
 
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index a9ad299ad8..9cf4082287 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -54,6 +54,7 @@ public:
     virtual ~tst_QFontDatabase();
 
 public slots:
+    void initTestCase();
     void init();
     void cleanup();
 private slots:
@@ -73,13 +74,16 @@ private slots:
 
     void addAppFont_data();
     void addAppFont();
+
+    void aliases();
+
+private:
+    const QString m_testFont;
 };
 
 tst_QFontDatabase::tst_QFontDatabase()
+    : m_testFont(QFINDTESTDATA("FreeMono.ttf"))
 {
-#ifndef Q_OS_IRIX
-    QDir::setCurrent(SRCDIR);
-#endif
 }
 
 tst_QFontDatabase::~tst_QFontDatabase()
@@ -87,6 +91,11 @@ tst_QFontDatabase::~tst_QFontDatabase()
 
 }
 
+void tst_QFontDatabase::initTestCase()
+{
+    QVERIFY(!m_testFont.isEmpty());
+}
+
 void tst_QFontDatabase::init()
 {
 // TODO: Add initialization code here.
@@ -228,13 +237,13 @@ void tst_QFontDatabase::addAppFont()
 
     int id;
     if (useMemoryFont) {
-        QFile fontfile("FreeMono.ttf");
+        QFile fontfile(m_testFont);
         fontfile.open(QIODevice::ReadOnly);
         QByteArray fontdata = fontfile.readAll();
         QVERIFY(!fontdata.isEmpty());
         id = QFontDatabase::addApplicationFontFromData(fontdata);
     } else {
-        id = QFontDatabase::addApplicationFont("FreeMono.ttf");
+        id = QFontDatabase::addApplicationFont(m_testFont);
     }
 #if defined(Q_OS_HPUX) && defined(QT_NO_FONTCONFIG)
     // Documentation says that X11 systems that don't have fontconfig
@@ -268,5 +277,22 @@ void tst_QFontDatabase::addAppFont()
     QCOMPARE(db.families(), oldFamilies);
 }
 
+QT_BEGIN_NAMESPACE
+Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
+QT_END_NAMESPACE
+
+void tst_QFontDatabase::aliases()
+{
+    QFontDatabase db;
+    const QStringList families = db.families();
+    QVERIFY(!families.isEmpty());
+    const QString firstFont = families.front();
+    QVERIFY(db.hasFamily(firstFont));
+    const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
+    QVERIFY(!db.hasFamily(alias));
+    qt_registerAliasToFontFamily(firstFont, alias);
+    QVERIFY(db.hasFamily(alias));
+}
+
 QTEST_MAIN(tst_QFontDatabase)
 #include "tst_qfontdatabase.moc"