diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-10-15 14:57:50 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-10-15 15:15:19 (GMT) |
| commit | 08554b7e8e58c685879881b17bdf65c5f4594c3c (patch) | |
| tree | 536551479579b6423966162405198253dc757dd7 /src | |
| parent | a38dcd522e05514a8caeeee7d01b05ec6af23fe1 (diff) | |
| download | Qt-08554b7e8e58c685879881b17bdf65c5f4594c3c.zip Qt-08554b7e8e58c685879881b17bdf65c5f4594c3c.tar.gz Qt-08554b7e8e58c685879881b17bdf65c5f4594c3c.tar.bz2 | |
Fixed tst_QPixmap test failures with GL pixmap backend.
Fixes test failures in fill() and setGetMask().
Reviewed-by: Trond
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 3a657f1..ba4663f 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -426,6 +426,10 @@ QImage QGLPixmapData::fillImage(const QColor &color) const if (pixelType() == BitmapType) { img = QImage(w, h, QImage::Format_MonoLSB); + img.setNumColors(2); + img.setColor(0, QColor(Qt::color0).rgba()); + img.setColor(1, QColor(Qt::color1).rgba()); + if (color == Qt::color1) img.fill(1); else |