summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-12-02 14:42:16 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-02 18:39:20 +0000
commitaeb0a36015f69f301aa6aa87dd84c644c825308e (patch)
treec87cef6dfa04069802f2052cc000f17d366f990f /tests
parent62eb969d38c9c926b06166dc89504fb7f7c71aab (diff)
Fix tst_QFontDatabase::aliases failure with ambiguous font
If the first font in the families list happens to have been disambiguated because of duplicates, two things went wrong: 1. hasFamily() would return false for the font family, because it does not disambiguate when checking for the family name and only checks if the families list contains the exact string. 2. Adding aliases to the full disambiguated string is not supported, only the family name. The first issue has been reported separately as QTBUG-89068. The test failure is fixed by just avoiding the fonts that are ambiguous in the test, as it really doesn't matter which font we pick. Fixes: QTBUG-89008 Change-Id: I829778c2e7bb6090475c34dcf9cdce58862729d6 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 34fa01be82065241cd9a369ae49749422d8e7831) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 38c423c4d6..ebd0673cde 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -303,7 +303,18 @@ void tst_QFontDatabase::aliases()
{
const QStringList families = QFontDatabase::families();
QVERIFY(!families.isEmpty());
- const QString firstFont = families.front();
+
+ QString firstFont;
+ for (int i = 0; i < families.size(); ++i) {
+ if (!families.at(i).contains('[')) {
+ firstFont = families.at(i);
+ break;
+ }
+ }
+
+ if (firstFont.isEmpty())
+ QSKIP("Skipped because there are no unambiguous font families on the system.");
+
QVERIFY(QFontDatabase::hasFamily(firstFont));
const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
QVERIFY(!QFontDatabase::hasFamily(alias));