From 0c3d898a03b675c942e5c8a798b54676d3edf3ae Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 25 Oct 2011 11:28:47 +0200 Subject: Tests: Remove Q_WS_QPA, qpa-sections from .profiles. Compile without -qpa. - Make Q_WS_QPA-#ifdefed sections the default in the code - Replace some Q_WS_ by Q_OS_ - Add ### fixme for places that need checking - Remove qpa conditionals from .pro files. Change-Id: I6ea930afc0c236cc12a7b7e95f1b8a1c24b3a513 Reviewed-by: Friedemann Kleint --- tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/auto/gui/text/qcssparser/tst_qcssparser.cpp') diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 822b5275da..1166c014fa 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -1593,12 +1593,10 @@ void tst_QCssParser::extractFontFamily() extractor.extractFont(&fnt, &adjustment); QFontInfo info(fnt); -#ifdef Q_WS_QPA // 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 + // loaded from disk: ### fixme: Check platforms QSKIP("QTBUG-20986 may fail on qpa"); -#endif QTEST(info.family(), "expectedFamily"); } -- cgit v1.2.3