Fix tst_qfontdatabase on Windows with Freetype
Since e05e3c776256d35798f451f31cd71e809786ed78, the advance test in tst_QFontDatabase::condensedFontMatching() passes with the bundled freetype engine, so the XFAIL causes a failure when running with this configuration. Pick-to: 6.2 Change-Id: Ie6fbccfa0d9c79654563e9e3f19694f252e32fc6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
parent
9991ca9163
commit
518790af79
@ -34,6 +34,8 @@
|
||||
#include <qfontmetrics.h>
|
||||
#include <qtextlayout.h>
|
||||
#include <private/qrawfont_p.h>
|
||||
#include <private/qfont_p.h>
|
||||
#include <private/qfontengine_p.h>
|
||||
#include <qpa/qplatformfontdatabase.h>
|
||||
|
||||
Q_LOGGING_CATEGORY(lcTests, "qt.text.tests")
|
||||
@ -429,7 +431,9 @@ void tst_QFontDatabase::condensedFontMatching()
|
||||
tfcByStyleName.setStyleName("Condensed");
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue);
|
||||
QFontPrivate *font_d = QFontPrivate::get(tfcByStretch);
|
||||
if (font_d->engineForScript(QChar::Script_Common)->type() != QFontEngine::Freetype)
|
||||
QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue);
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
|
Loading…
x
Reference in New Issue
Block a user