diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 05:38:54 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 05:38:54 (GMT) |
| commit | 37d71b2653b9f31ee73fdd09b0d2be757d4537bd (patch) | |
| tree | 5877aa8f77e34db7ab6d9c58180d32952c65b49c /tests/auto/qimagereader | |
| parent | eaa981c943293bf346a041aa4ad3d254e99ebd78 (diff) | |
| parent | dd2be9c7e7540870ddc532f02bd83860273cbbd6 (diff) | |
| download | Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.zip Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.tar.gz Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'tests/auto/qimagereader')
| -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 aadee5b..1fe1332 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -1884,14 +1884,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; |