diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
| commit | 3794e55c2c8427dd8bd4f86af5e894cc80267881 (patch) | |
| tree | 9067656d5e021a585a976fb84f73b94e161cae19 /tests/auto/qimagewriter | |
| parent | 7be079e1b1f13b58f5d69f86e5854edd25065532 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'tests/auto/qimagewriter')
| -rw-r--r-- | tests/auto/qimagewriter/tst_qimagewriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp index 5ec287d3ac..5997f39924 100644 --- a/tests/auto/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp @@ -557,7 +557,7 @@ void tst_QImageWriter::saveWithNoFormat() QFETCH(QImageWriter::ImageWriterError, error); QImage niceImage(64, 64, QImage::Format_ARGB32); - qMemSet(niceImage.bits(), 0, niceImage.numBytes()); + qMemSet(niceImage.bits(), 0, niceImage.byteCount()); QImageWriter writer(fileName /* , 0 - no format! */); if (error != 0) { |