summaryrefslogtreecommitdiffstats
path: root/tests/auto/qcssparser/tst_cssparser.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-08 07:01:15 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-08 07:01:15 (GMT)
commit23ae8b6badfd688f962590268a6147771d27266c (patch)
treefc27f20c32e6dccbe39267214e65528b238ced70 /tests/auto/qcssparser/tst_cssparser.cpp
parent768cab51239a45f00d5ee3857efecd3d2cdcb99b (diff)
parentd4257360234a967bfbacde92ec2bb1ac8979b793 (diff)
downloadQt-23ae8b6badfd688f962590268a6147771d27266c.zip
Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.gz
Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qcssparser/tst_cssparser.cpp')
-rw-r--r--tests/auto/qcssparser/tst_cssparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp
index 28ba85e..17df9a2 100644
--- a/tests/auto/qcssparser/tst_cssparser.cpp
+++ b/tests/auto/qcssparser/tst_cssparser.cpp
@@ -1475,7 +1475,7 @@ void tst_CssParser::extractFontFamily_data()
QTest::newRow("unquoted-family-name2") << "font-family: Times New Roman" << QString("Times New Roman");
QTest::newRow("multiple") << "font-family: Times New Roman , foobar, 'baz'" << QString("Times New Roman");
QTest::newRow("multiple2") << "font-family: invalid, Times New Roman " << QString("Times New Roman");
- QTest::newRow("invalid") << "font-family: invalid" << QFont().family();
+ QTest::newRow("invalid") << "font-family: invalid" << QFontInfo(QFont("invalid font")).family();
QTest::newRow("shorthand") << "font: 12pt Times New Roman" << QString("Times New Roman");
QTest::newRow("shorthand multiple quote") << "font: 12pt invalid, \"Times New Roman\" " << QString("Times New Roman");
QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman");