summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-10-12 13:08:06 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-10-13 07:27:04 +0000
commitbc294899e588a743d96a0110f7575902c482a806 (patch)
tree2bf876e09d72a5add0ae5c1ad157a4be684595d0 /tests
parentb89d68f8610fa74c90905ffde4e1479ac78ddf45 (diff)
Fallback to using the family when doing an exact match
If the difference between the families sizes is just 1 where one of them is 0 in size then we can fallback to the family in that case. Fixes: QTBUG-87267 Change-Id: I62b25b06c88000b4d7defe91871c07873b1fc792 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit bdc9d272eebff66827b566b1b24b6697c797807a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/text/qfont/tst_qfont.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 2d72eef459..9b70308092 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -134,6 +134,21 @@ void tst_QFont::exactMatch()
QVERIFY(!QFont("serif").exactMatch());
QVERIFY(!QFont("monospace").exactMatch());
+ // Confirm that exactMatch is true for a valid font
+ QFontDatabase db;
+ const QString family = db.families().first();
+ const QString style = db.styles(family).first();
+ const int pointSize = db.pointSizes(family, style).first();
+ font = db.font(family, style, pointSize);
+ QVERIFY(font.exactMatch());
+
+ if (db.families().contains("Arial")) {
+ font = QFont("Arial");
+ QVERIFY(font.exactMatch());
+ font = QFont(QString());
+ font.setFamilies({"Arial"});
+ QVERIFY(font.exactMatch());
+ }
}
void tst_QFont::italicOblique()