diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-07 14:37:58 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-23 10:04:47 +0000 |
| commit | 9204b8c31ea1b5f0c05870c5b5d74c33b1a4f622 (patch) | |
| tree | e86eaa69aa39a94ec7d243c831c18f6122e3de03 /tests | |
| parent | 53686bf86db1c2695ee16b903e4b86cc3ee74006 (diff) | |
Register fonts with preferred names on Windows
Looks up the canonical names of enumerated fonts and register them under
their preferred names if present.
Also changes the logic handling registration of english aliases, so it
is always done, even if it might in rare cases cause a double
registration since that is safe.
Task-number: QTBUG-53458
Change-Id: Ia010774b26072192b55697b717cc37442c852881
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index 8c26f8a91f..e8244a0e5d 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -326,6 +326,10 @@ void tst_QFontDatabase::condensedFontMatching() QFont tfcByStyleName("QtBidiTestFont"); tfcByStyleName.setStyleName("Condensed"); +#ifdef Q_OS_WIN + QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue); +#endif + QCOMPARE(QFontMetrics(tfcByStretch).width(testString()), QFontMetrics(tfcByStyleName).width(testString())); |