diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-09 23:21:25 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-09 23:21:25 (GMT) |
| commit | e80adac9902abfd423aae23dd22f490a33763228 (patch) | |
| tree | 63cc04b5546454fcf668125169c6793fcdbdf04c /tests/auto/qdatastream/tst_qdatastream.cpp | |
| parent | 87fb186c553d0875c92938a6fd5a9aaf8d69a057 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-e80adac9902abfd423aae23dd22f490a33763228.zip Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.gz Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.bz2 | |
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'tests/auto/qdatastream/tst_qdatastream.cpp')
| -rw-r--r-- | tests/auto/qdatastream/tst_qdatastream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index 56fc53a..7535645 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -1461,7 +1461,7 @@ void tst_QDataStream::readQImage(QDataStream *s) QVERIFY(d12.width() == ref.width()); QVERIFY(d12.height() == ref.height()); QVERIFY(d12.depth() == ref.depth()); - QVERIFY(d12.numColors() == ref.numColors()); + QVERIFY(d12.colorCount() == ref.colorCount()); #ifdef QT3_SUPPORT QVERIFY(d12.hasAlphaBuffer() == ref.hasAlphaBuffer()); #else |