From 4959e6af8e5b8d6dbf677fcd0802e4dc43083308 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 10 May 2012 16:50:33 +0200 Subject: Support specifying fallbacks in font request on QPA Because the QPA font database would query fallback families inside findFont(), support for requesting multiple font families in order of preference (like QFont("Times New Roman, Arial")) did not work, because the Arial fallback was never attempted. To fix this, we pass in the queried fallbacks and make sure they are tried before any platform specific fallbacks. Task-number: QTBUG-20986 Change-Id: Idb2b717856f013ce2874f00a8debaff60176d2fc Reviewed-by: Jiang Jiang --- tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tests') diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 7e0a60c859..4d50601664 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -1592,11 +1592,6 @@ void tst_QCssParser::extractFontFamily() extractor.extractFont(&fnt, &adjustment); QFontInfo info(fnt); - // Note, we have to QSKIP rather than QEXPECT_FAIL because font lookup is broken - // such that it may work or not work depending on the order in which fonts were - // loaded from disk: ### fixme: Check platforms - QSKIP("QTBUG-20986 may fail on qpa"); - QTEST(info.family(), "expectedFamily"); } -- cgit v1.2.3