From 34e2cd4e715a9760b2829cff13fd2526f6a290ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Thu, 6 Aug 2009 09:41:56 +0200
Subject: Update baseline (project.ts.result) for the good:backslashes case.

---
 .../auto/linguist/lupdate/testdata/good/backslashes/project.ts.result | 4 ++--
 1 file changed, 2 insertions(+), 2 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 &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation type="unfinished"></translation>
-- 
cgit v0.12


From de63f4572096b652cd8d445ae0ea0c880197b6d3 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 6 Aug 2009 10:00:28 +0200
Subject: Resolved tst_QCssParser::extractFontFamily_data on jackychan

That machine has no 'Times New Roman' the test was reliying in
---
 tests/auto/qcssparser/tst_qcssparser.cpp | 7 +++++--
 1 file 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");
 
-- 
cgit v0.12