diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-08 07:37:06 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-08 07:37:06 (GMT) |
| commit | 28605b56271cd3efb78c5f2f51855d2bca56ee6f (patch) | |
| tree | 3bc0988400d8d8f4dd251c94d20443ecd3f6b150 /tests/auto/declarative/examples/tst_examples.cpp | |
| parent | 3ceffd7287a269ec5ea9dab712ee9120a539e0e1 (diff) | |
| parent | be8a7153d613586d69ac528153a6b8ccbe931aa6 (diff) | |
| download | Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.zip Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.tar.gz Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/tutorials/samegame/samegame4/content/samegame.js
Diffstat (limited to 'tests/auto/declarative/examples/tst_examples.cpp')
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 678dd59..dbd1f92 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -185,10 +185,10 @@ void tst_examples::examples() QFileInfo fi(file); QFileInfo dir(fi.path()); - QString script = "data/"+dir.baseName()+"/"+fi.baseName(); + QString script = SRCDIR "/data/"+dir.baseName()+"/"+fi.baseName(); QFileInfo testdata(script+".qml"); QStringList arguments; - arguments << "-script" << (testdata.exists() ? script : QLatin1String("data/dummytest")) + arguments << "-script" << (testdata.exists() ? script : QLatin1String(SRCDIR "/data/dummytest")) << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure" << file; QProcess p; |