diff options
| author | axis <qt-info@nokia.com> | 2009-06-08 08:51:51 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-08 08:51:51 +0200 |
| commit | d4257360234a967bfbacde92ec2bb1ac8979b793 (patch) | |
| tree | a907ea5fe0d3142ecefce50b79c735554efdf39b /tests/auto/qcssparser | |
| parent | 5163d6e1a36f48bf9d8483d3ca23ec730b5188c0 (diff) | |
| parent | 3b2b9d727f0fadf607968c73003e7550c8bd0296 (diff) | |
| download | qt4-tools-d4257360234a967bfbacde92ec2bb1ac8979b793.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
Diffstat (limited to 'tests/auto/qcssparser')
| -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 28ba85ea6b..17df9a2994 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"); |