diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2011-12-15 09:34:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-15 05:48:27 +0100 |
| commit | d936fe085894f58451a6f36c46377ac507f09170 (patch) | |
| tree | 4b447a2543ced8b0adc0c43bb0fd2bce43022ccb /tests/auto/gui/image/qmovie | |
| parent | 2163f05942a9e13264fcfc52666c451e9c77f5f0 (diff) | |
Fix qimagereader, qmovie and qmake unittest to work in shadow build.
Changed to use QFINDTESTDATA and TESTDATA.
Change-Id: I8684bc191cf8ffb8b531456e32047d582ebc018c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui/image/qmovie')
| -rw-r--r-- | tests/auto/gui/image/qmovie/qmovie.pro | 8 | ||||
| -rw-r--r-- | tests/auto/gui/image/qmovie/tst_qmovie.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro index d565418d6d..5da0b80670 100644 --- a/tests/auto/gui/image/qmovie/qmovie.pro +++ b/tests/auto/gui/image/qmovie/qmovie.pro @@ -8,11 +8,5 @@ MOC_DIR=tmp !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG !contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG -wince*: { - addFiles.files = animations\\* - addFiles.path = animations - DEPLOYMENT += addFiles -} - RESOURCES += resources.qrc - +TESTDATA += animations/* diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp index b2d0360e33..a94e39a10c 100644 --- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp +++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp @@ -152,7 +152,7 @@ void tst_QMovie::playMovie() QFETCH(QString, fileName); QFETCH(int, frameCount); - QMovie movie(fileName); + QMovie movie(QFINDTESTDATA(fileName)); QCOMPARE(movie.state(), QMovie::NotRunning); movie.setSpeed(1000); |