summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/examples
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/examples')
-rw-r--r--tests/auto/declarative/examples/data/dummytest.qml1
-rw-r--r--tests/auto/declarative/examples/data/webbrowser/webbrowser.qml2
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp5
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;