summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-08-06 08:00:28 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-08-06 08:03:39 (GMT)
commitde63f4572096b652cd8d445ae0ea0c880197b6d3 (patch)
tree99960c27663db6ba0a089c499a2e8df97ce4e811
parent34e2cd4e715a9760b2829cff13fd2526f6a290ec (diff)
downloadQt-de63f4572096b652cd8d445ae0ea0c880197b6d3.zip
Qt-de63f4572096b652cd8d445ae0ea0c880197b6d3.tar.gz
Qt-de63f4572096b652cd8d445ae0ea0c880197b6d3.tar.bz2
Resolved tst_QCssParser::extractFontFamily_data on jackychan
That machine has no 'Times New Roman' the test was reliying in
-rw-r--r--tests/auto/qcssparser/tst_qcssparser.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index c3bcdf2..be1a212 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -1139,8 +1139,8 @@ void tst_QCssParser::specificity()
QVERIFY(parser.parse(&sheet));
QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count() + sheet.idIndex.count() , 1);
- QCss::StyleRule rule = (!sheet.styleRules.isEmpty()) ? sheet.styleRules.at(0)
- : (!sheet.nameIndex.isEmpty()) ? *sheet.nameIndex.begin()
+ QCss::StyleRule rule = (!sheet.styleRules.isEmpty()) ? sheet.styleRules.at(0)
+ : (!sheet.nameIndex.isEmpty()) ? *sheet.nameIndex.begin()
: *sheet.idIndex.begin();
QCOMPARE(rule.selectors.count(), 1);
QTEST(rule.selectors.at(0).specificity(), "specificity");
@@ -1508,6 +1508,9 @@ void tst_QCssParser::gradient()
void tst_QCssParser::extractFontFamily_data()
{
+ if (QFontInfo(QFont("Times New Roman")).family() != "Times New Roman")
+ QSKIP("'Times New Roman' font not found ", SkipAll);
+
QTest::addColumn<QString>("css");
QTest::addColumn<QString>("expectedFamily");