diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
| commit | e9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch) | |
| tree | cc9fc9c931423674081b6ab843d22bc643a5df64 /tests/auto/qpainter | |
| parent | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff) | |
| parent | a2a3adf7de2ffc9784fea177a43f3124862a992a (diff) | |
| download | Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2 | |
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'tests/auto/qpainter')
| -rw-r--r-- | tests/auto/qpainter/tst_qpainter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index 02c73c0..8b71349 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -2932,7 +2932,7 @@ void tst_QPainter::monoImages() QImage img(2, 2, format); - if (img.numColors() > 0) { + if (img.colorCount() > 0) { img.setColor(0, QColor(colorPairs[j][0]).rgba()); img.setColor(1, QColor(colorPairs[j][1]).rgba()); } @@ -2954,7 +2954,7 @@ void tst_QPainter::monoImages() // should not change the image QCOMPARE(original, img); - if (img.numColors() == 0) + if (img.colorCount() == 0) continue; for (int k = 0; k < 2; ++k) { |