diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 00:53:00 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 00:53:00 (GMT) |
| commit | aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (patch) | |
| tree | 2848c48829255e8a2e85cc50bd84cc6a2a27939c /tests/auto/declarative/examples | |
| parent | f3cce7a770f25c42d5c85b012df338fc712f5b2e (diff) | |
| parent | 9e5c80bd52467afa481775fe9695bac7edcf7324 (diff) | |
| download | Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.zip Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.tar.gz Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/examples')
| -rw-r--r-- | tests/auto/declarative/examples/data/dummytest.qml | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/data/webbrowser/webbrowser.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/declarative/examples/data/dummytest.qml b/tests/auto/declarative/examples/data/dummytest.qml index cd9d8fb..b20e907 100644 --- a/tests/auto/declarative/examples/data/dummytest.qml +++ b/tests/auto/declarative/examples/data/dummytest.qml @@ -2,4 +2,5 @@ import Qt.VisualTest 4.6 VisualTest { Frame { msec: 0 } + Frame { msec: 10 } } diff --git a/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml b/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml index bdf3290..d31787b 100644 --- a/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml +++ b/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml @@ -2,5 +2,5 @@ import Qt.VisualTest 4.6 VisualTest { Frame { msec: 0 } - Frame { msec: 1000 } + Frame { msec: 2000 } } diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index d758101..2cbb916 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -182,9 +182,10 @@ void tst_examples::examples() QFileInfo fi(file); QFileInfo dir(fi.path()); - QFileInfo testdata("data/"+dir.baseName()+"/"+fi.baseName()); + QString script = "data/"+dir.baseName()+"/"+fi.baseName(); + QFileInfo testdata(script+".qml"); QStringList arguments; - arguments << "-script" << (testdata.exists() ? testdata.filePath() : QLatin1String("data/dummytest")) + arguments << "-script" << (testdata.exists() ? script : QLatin1String("data/dummytest")) << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure" << file; QProcess p; |