1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly fix QFontDatabase test on Freetype

Browse Source 
Amends 4dd5020fbdfdd34f1e4ec54521217e472942a4b4. I messed up the fix for
the XFAIL condition, since the font engine type we get from a normal QFont
will be QFontEngine::Multi regardless of whether the actual font engines
are Freetype or not. Use NoFontMerging to avoid this.

Pick-to: 6.2
Task-number: QTBUG-97995
Change-Id: I2298c997e6826e667dbb8e3d004821f296625ef7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-11-11 13:43:08 +01:00
parent 7490937609
commit cde562cf6d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -431,7 +431,9 @@ void tst_QFontDatabase::condensedFontMatching()
tfcByStyleName.setStyleName("Condensed"); tfcByStyleName.setStyleName("Condensed");
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QFontPrivate *font_d = QFontPrivate::get(tfcByStretch); QFont f;
f.setStyleStrategy(QFont::NoFontMerging);
QFontPrivate *font_d = QFontPrivate::get(f);
if (font_d->engineForScript(QChar::Script_Common)->type() != QFontEngine::Freetype) if (font_d->engineForScript(QChar::Script_Common)->type() != QFontEngine::Freetype)
QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue); QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue);
#endif #endif