From bf42eacc7fb283d123f9bdf9ebc19c16dd7035e4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 8 Jul 2013 16:50:31 +0200 Subject: Windows font database: Resolve aliases for extra fonts. Ensure QFontDataBase::hasFamily() deals with aliases. Task-number: QTBUG-31689 Change-Id: Ia59bfcb93362ac9343c6d30dab1091a4db482dfa Reviewed-by: Konstantin Ritt --- .../auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/auto/gui/text/qfontdatabase') diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index a9ad299ad8..715d937a7f 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -73,6 +73,8 @@ private slots: void addAppFont_data(); void addAppFont(); + + void aliases(); }; tst_QFontDatabase::tst_QFontDatabase() @@ -268,5 +270,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" -- cgit v1.2.3