diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 14:50:43 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 14:50:43 (GMT) |
| commit | e40d3cedcf29b89998ffc81f959b2b8523989394 (patch) | |
| tree | 9c22c14049d67a9c4dc65675bb732366edb0af28 /tests | |
| parent | 1a7da7096bbda17197738061902f4489af234bc0 (diff) | |
| parent | a5b11b9031f9a2a97b65e9a6134244249845491a (diff) | |
| download | Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.zip Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.tar.gz Qt-e40d3cedcf29b89998ffc81f959b2b8523989394.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcssparser/tst_cssparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp index 7c4fac1..b41a745 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"); |