summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-04-20 05:24:10 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-04-21 00:02:30 (GMT)
commitb65cfb07a5bdf9e4ea1ea6e652688824f7b5da15 (patch)
treeb2f4ca5167839e5aee7d18b0bf442d8cf8726503
parentd5f5b9b5f3e21f1a75e52cc15dc8de2b1b72529f (diff)
downloadQt-b65cfb07a5bdf9e4ea1ea6e652688824f7b5da15.zip
Qt-b65cfb07a5bdf9e4ea1ea6e652688824f7b5da15.tar.gz
Qt-b65cfb07a5bdf9e4ea1ea6e652688824f7b5da15.tar.bz2
Visual test fix.
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml2
-rw-r--r--tools/qml/qdeclarativetester.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
index 1403d35..dd38ea5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
@@ -6,6 +6,6 @@ VisualTest {
}
Frame {
msec: 16
- hash: "258a7e75b491e4f51a91739c776803b3"
+ image: "borders.0.png"
}
}
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 11fa22f..6a6048a 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -251,7 +251,8 @@ void QDeclarativeTester::updateCurrentTime(int msec)
m_view->render(&p);
}
- bool snapshot = msec == 16 && options & QDeclarativeViewer::Snapshot;
+ bool snapshot = msec == 16 && (options & QDeclarativeViewer::Snapshot
+ || (testscript && testscript->count() == 2));
FrameEvent fe;
fe.msec = msec;