diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-08-06 08:04:49 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-08-06 08:04:49 (GMT) |
| commit | d16ae8ffa8432541ddf481d4166a04e9cfa4e5b4 (patch) | |
| tree | 1d13fe0ad391ea8c97e6affb2cd5ace18c73b73c | |
| parent | 0588b9c8c57fd204372556c7fc376b8d44672fa6 (diff) | |
| parent | de63f4572096b652cd8d445ae0ea0c880197b6d3 (diff) | |
| download | Qt-d16ae8ffa8432541ddf481d4166a04e9cfa4e5b4.zip Qt-d16ae8ffa8432541ddf481d4166a04e9cfa4e5b4.tar.gz Qt-d16ae8ffa8432541ddf481d4166a04e9cfa4e5b4.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result | 4 | ||||
| -rw-r--r-- | tests/auto/qcssparser/tst_qcssparser.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result index 151a18e..f2d109b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="1.1"> +<TS version="2.0"> <context> <name>QApplication</name> <message> - <location filename="../src/main.cpp" line="13"/> + <location filename="../src/main.cpp" line="10"/> <source>QT_LAYOUT_DIRECTION</source> <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> <translation type="unfinished"></translation> 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"); |