diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 00:55:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 00:55:32 (GMT) |
| commit | dd2be9c7e7540870ddc532f02bd83860273cbbd6 (patch) | |
| tree | c2b5e6624f48ca188a6a20b83b77288837f48a8d /tests | |
| parent | 47249ef4ccf8014f5252a37252fc76a326e7818c (diff) | |
| parent | aa97c7b7a71ddaf3f01f312658b9a43428846aee (diff) | |
| download | Qt-dd2be9c7e7540870ddc532f02bd83860273cbbd6.zip Qt-dd2be9c7e7540870ddc532f02bd83860273cbbd6.tar.gz Qt-dd2be9c7e7540870ddc532f02bd83860273cbbd6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed unit test failure in qimagereader.
Regression Qt4.4: QMovie does not render properly some mng files
QMovie cpu usage up to 100%
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qimagereader/tst_qimagereader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index 99244c2..fc2582f 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -1763,14 +1763,14 @@ void tst_QImageReader::testIgnoresFormatAndExtension() QFETCH(QString, expected); QList<QByteArray> formats = QImageReader::supportedImageFormats(); - QString fileNameBase = "images/" + name + "."; + QString fileNameBase = prefix + name + "."; foreach (const QByteArray &f, formats) { if (f == extension) continue; QFile tmp(QDir::tempPath() + "/" + name + "_" + expected + "." + f); - QFile::copy(fileNameBase + extension, QFileInfo(tmp).absoluteFilePath()); + QVERIFY(QFile::copy(fileNameBase + extension, QFileInfo(tmp).absoluteFilePath())); QString format; QImage image; |