From e1452cfc79a1fed77e646427092e181b7eb2ca2f Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 7 Oct 2009 11:18:22 +1000
Subject: Fix portability of visual tests: fix filenames to be relative to base
 (URL). Still not font-portable.

---
 .../bindinganimation/data/bindinganimation.qml       |  4 ++--
 .../visual/colorAnimation/data/colorAnimation.qml    |  6 +++---
 tests/auto/declarative/visual/easing/data/easing.qml |  6 +++---
 .../declarative/visual/flickable/data/flickable.qml  |  6 +++---
 .../auto/declarative/visual/focusscope/data/test.qml | 12 ++++++------
 .../declarative/visual/focusscope/data/test2.qml     |  4 ++--
 .../declarative/visual/focusscope/data/test3.qml     | 20 ++++++++++----------
 .../visual/pauseAnimation/data/pauseAnimation.qml    | 12 ++++++------
 .../declarative/visual/qfxtext/elide/data/elide.qml  |  2 +-
 .../auto/declarative/visual/repeater/data/basic1.qml |  2 +-
 .../auto/declarative/visual/repeater/data/basic2.qml |  2 +-
 .../auto/declarative/visual/repeater/data/basic3.qml |  2 +-
 .../auto/declarative/visual/repeater/data/basic4.qml |  2 +-
 tests/auto/declarative/visual/tst_visual.cpp         |  2 ++
 tools/qmlviewer/qfxtester.cpp                        |  4 ++--
 tools/qmlviewer/qfxtester.h                          |  8 ++++----
 16 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.qml
index 1d2f6da..2501797 100644
--- a/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.qml
+++ b/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.0.png"
+        image: "bindinganimation.0.png"
     }
     Frame {
         msec: 976
@@ -498,7 +498,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/bindinganimation/data/bindinganimation.1.png"
+        image: "bindinganimation.1.png"
     }
     Frame {
         msec: 1936
diff --git a/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.qml b/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.qml
index 8f7f068..6654021 100644
--- a/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.qml
+++ b/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.qml
@@ -258,7 +258,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.0.png"
+        image: "colorAnimation.0.png"
     }
     Frame {
         msec: 976
@@ -498,7 +498,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.1.png"
+        image: "colorAnimation.1.png"
     }
     Frame {
         msec: 1936
@@ -738,7 +738,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/colorAnimation/data/colorAnimation.2.png"
+        image: "colorAnimation.2.png"
     }
     Frame {
         msec: 2896
diff --git a/tests/auto/declarative/visual/easing/data/easing.qml b/tests/auto/declarative/visual/easing/data/easing.qml
index d991596..c41d676 100644
--- a/tests/auto/declarative/visual/easing/data/easing.qml
+++ b/tests/auto/declarative/visual/easing/data/easing.qml
@@ -258,7 +258,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/easing/data/easing.0.png"
+        image: "easing.0.png"
     }
     Frame {
         msec: 976
@@ -514,7 +514,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/easing/data/easing.1.png"
+        image: "easing.1.png"
     }
     Frame {
         msec: 1936
@@ -770,7 +770,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/easing/data/easing.2.png"
+        image: "easing.2.png"
     }
     Frame {
         msec: 2896
diff --git a/tests/auto/declarative/visual/flickable/data/flickable.qml b/tests/auto/declarative/visual/flickable/data/flickable.qml
index 45bb989..730c128 100644
--- a/tests/auto/declarative/visual/flickable/data/flickable.qml
+++ b/tests/auto/declarative/visual/flickable/data/flickable.qml
@@ -298,7 +298,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/flickable/data/flickable.0.png"
+        image: "flickable.0.png"
     }
     Frame {
         msec: 976
@@ -538,7 +538,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/flickable/data/flickable.1.png"
+        image: "flickable.1.png"
     }
     Frame {
         msec: 1936
@@ -786,6 +786,6 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/flickable/data/flickable.2.png"
+        image: "flickable.2.png"
     }
 }
diff --git a/tests/auto/declarative/visual/focusscope/data/test.qml b/tests/auto/declarative/visual/focusscope/data/test.qml
index 95e23fc..d86c034 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.qml
+++ b/tests/auto/declarative/visual/focusscope/data/test.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.0.png"
+        image: "test.0.png"
     }
     Frame {
         msec: 976
@@ -506,7 +506,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.1.png"
+        image: "test.1.png"
     }
     Frame {
         msec: 1936
@@ -770,7 +770,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.2.png"
+        image: "test.2.png"
     }
     Frame {
         msec: 2896
@@ -1042,7 +1042,7 @@ VisualTest {
     }
     Frame {
         msec: 3840
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.3.png"
+        image: "test.3.png"
     }
     Frame {
         msec: 3856
@@ -1306,7 +1306,7 @@ VisualTest {
     }
     Frame {
         msec: 4800
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.4.png"
+        image: "test.4.png"
     }
     Frame {
         msec: 4816
@@ -1554,7 +1554,7 @@ VisualTest {
     }
     Frame {
         msec: 5760
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test.5.png"
+        image: "test.5.png"
     }
     Frame {
         msec: 5776
diff --git a/tests/auto/declarative/visual/focusscope/data/test2.qml b/tests/auto/declarative/visual/focusscope/data/test2.qml
index 4ad4b89..fedc96a 100644
--- a/tests/auto/declarative/visual/focusscope/data/test2.qml
+++ b/tests/auto/declarative/visual/focusscope/data/test2.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test2.0.png"
+        image: "test2.0.png"
     }
     Frame {
         msec: 976
@@ -482,7 +482,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test2.1.png"
+        image: "test2.1.png"
     }
     Frame {
         msec: 1936
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.qml b/tests/auto/declarative/visual/focusscope/data/test3.qml
index 86025a6..8ce7944 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.qml
+++ b/tests/auto/declarative/visual/focusscope/data/test3.qml
@@ -258,7 +258,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.0.png"
+        image: "test3.0.png"
     }
     Frame {
         msec: 976
@@ -530,7 +530,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.1.png"
+        image: "test3.1.png"
     }
     Frame {
         msec: 1936
@@ -802,7 +802,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.2.png"
+        image: "test3.2.png"
     }
     Frame {
         msec: 2896
@@ -1074,7 +1074,7 @@ VisualTest {
     }
     Frame {
         msec: 3840
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.3.png"
+        image: "test3.3.png"
     }
     Frame {
         msec: 3856
@@ -1330,7 +1330,7 @@ VisualTest {
     }
     Frame {
         msec: 4800
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.4.png"
+        image: "test3.4.png"
     }
     Frame {
         msec: 4816
@@ -1594,7 +1594,7 @@ VisualTest {
     }
     Frame {
         msec: 5760
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.5.png"
+        image: "test3.5.png"
     }
     Frame {
         msec: 5776
@@ -1858,7 +1858,7 @@ VisualTest {
     }
     Frame {
         msec: 6720
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.6.png"
+        image: "test3.6.png"
     }
     Frame {
         msec: 6736
@@ -2130,7 +2130,7 @@ VisualTest {
     }
     Frame {
         msec: 7680
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.7.png"
+        image: "test3.7.png"
     }
     Frame {
         msec: 7696
@@ -2402,7 +2402,7 @@ VisualTest {
     }
     Frame {
         msec: 8640
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.8.png"
+        image: "test3.8.png"
     }
     Frame {
         msec: 8656
@@ -2658,7 +2658,7 @@ VisualTest {
     }
     Frame {
         msec: 9600
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/focusscope/data/test3.9.png"
+        image: "test3.9.png"
     }
     Frame {
         msec: 9616
diff --git a/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.qml
index 5d42d03..73c6542 100644
--- a/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.0.png"
+        image: "pauseAnimation.0.png"
     }
     Frame {
         msec: 976
@@ -482,7 +482,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.1.png"
+        image: "pauseAnimation.1.png"
     }
     Frame {
         msec: 1936
@@ -722,7 +722,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.2.png"
+        image: "pauseAnimation.2.png"
     }
     Frame {
         msec: 2896
@@ -962,7 +962,7 @@ VisualTest {
     }
     Frame {
         msec: 3840
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.3.png"
+        image: "pauseAnimation.3.png"
     }
     Frame {
         msec: 3856
@@ -1202,7 +1202,7 @@ VisualTest {
     }
     Frame {
         msec: 4800
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.4.png"
+        image: "pauseAnimation.4.png"
     }
     Frame {
         msec: 4816
@@ -1442,7 +1442,7 @@ VisualTest {
     }
     Frame {
         msec: 5760
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/pauseAnimation/data/pauseAnimation.5.png"
+        image: "pauseAnimation.5.png"
     }
     Frame {
         msec: 5776
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml b/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml
index e62c1b7..59f17f7 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/qfxtext/elide/data/elide.0.png"
+        image: "elide.0.png"
     }
     Frame {
         msec: 976
diff --git a/tests/auto/declarative/visual/repeater/data/basic1.qml b/tests/auto/declarative/visual/repeater/data/basic1.qml
index ad7e911..9535a2c 100644
--- a/tests/auto/declarative/visual/repeater/data/basic1.qml
+++ b/tests/auto/declarative/visual/repeater/data/basic1.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/repeater/data/basic1.0.png"
+        image: "basic1.0.png"
     }
     Frame {
         msec: 976
diff --git a/tests/auto/declarative/visual/repeater/data/basic2.qml b/tests/auto/declarative/visual/repeater/data/basic2.qml
index 082f349..81bc1f7 100644
--- a/tests/auto/declarative/visual/repeater/data/basic2.qml
+++ b/tests/auto/declarative/visual/repeater/data/basic2.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/repeater/data/basic2.0.png"
+        image: "basic2.0.png"
     }
     Frame {
         msec: 976
diff --git a/tests/auto/declarative/visual/repeater/data/basic3.qml b/tests/auto/declarative/visual/repeater/data/basic3.qml
index e76bf6f..417eaab 100644
--- a/tests/auto/declarative/visual/repeater/data/basic3.qml
+++ b/tests/auto/declarative/visual/repeater/data/basic3.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/repeater/data/basic3.0.png"
+        image: "basic3.0.png"
     }
     Frame {
         msec: 976
diff --git a/tests/auto/declarative/visual/repeater/data/basic4.qml b/tests/auto/declarative/visual/repeater/data/basic4.qml
index cdff83f..264d825 100644
--- a/tests/auto/declarative/visual/repeater/data/basic4.qml
+++ b/tests/auto/declarative/visual/repeater/data/basic4.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "/Users/akennedy/Qt/kinetic/tests/auto/declarative/visual/repeater/data/basic4.0.png"
+        image: "basic4.0.png"
     }
     Frame {
         msec: 976
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp
index 458b96e..d95fa5b 100644
--- a/tests/auto/declarative/visual/tst_visual.cpp
+++ b/tests/auto/declarative/visual/tst_visual.cpp
@@ -78,6 +78,8 @@ void tst_visual::visual()
     QProcess p;
     p.start(qmlviewer, arguments);
     QVERIFY(p.waitForFinished());
+    if (p.exitCode() != 0)
+        qDebug() << p.readAllStandardError();
     QCOMPARE(p.exitStatus(), QProcess::NormalExit);
     QCOMPARE(p.exitCode(), 0);
 }
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp
index 7903fa9..a6a46eb 100644
--- a/tools/qmlviewer/qfxtester.cpp
+++ b/tools/qmlviewer/qfxtester.cpp
@@ -285,9 +285,9 @@ void QFxTester::updateCurrentTime(int msec)
             }
 
             if (options & QmlViewer::TestImages && !frame->image().isEmpty()) {
-                QImage goodImage(frame->image());
+                QImage goodImage(frame->image().toLocalFile());
                 if (goodImage != img) {
-                    QString reject(frame->image() + ".reject.png");
+                    QString reject(frame->image().toLocalFile() + ".reject.png");
                     qWarning() << "QFxTester: Image mismatch.  Reject saved to:" 
                                << reject;
                     img.save(reject);
diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h
index bb027f6..52987db 100644
--- a/tools/qmlviewer/qfxtester.h
+++ b/tools/qmlviewer/qfxtester.h
@@ -44,7 +44,7 @@ class QFxVisualTestFrame : public QObject
     Q_OBJECT
     Q_PROPERTY(int msec READ msec WRITE setMsec)
     Q_PROPERTY(QString hash READ hash WRITE setHash)
-    Q_PROPERTY(QString image READ image WRITE setImage)
+    Q_PROPERTY(QUrl image READ image WRITE setImage)
 public:
     QFxVisualTestFrame() : m_msec(-1) {}
 
@@ -54,13 +54,13 @@ public:
     QString hash() const { return m_hash; }
     void setHash(const QString &hash) { m_hash = hash; }
 
-    QString image() const { return m_image; }
-    void setImage(const QString &image) { m_image = image; }
+    QUrl image() const { return m_image; }
+    void setImage(const QUrl &image) { m_image = image; }
 
 private:
     int m_msec;
     QString m_hash;
-    QString m_image;
+    QUrl m_image;
 };
 QML_DECLARE_TYPE(QFxVisualTestFrame)
 
-- 
cgit v0.12