diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-13 06:20:37 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-13 06:20:37 (GMT) |
| commit | a69086dd550e97957d985b5ec352f256bb8ddc29 (patch) | |
| tree | ddbda4ab4449074c38d82754fc8d4a99a12d1110 /src/opengl/qpixmapdata_gl.cpp | |
| parent | ec7590bf1b7120dd6948766280917a3db555d97f (diff) | |
| parent | 7a05add9235a76f5a3fb721b574c3f41af32ea1f (diff) | |
| download | Qt-a69086dd550e97957d985b5ec352f256bb8ddc29.zip Qt-a69086dd550e97957d985b5ec352f256bb8ddc29.tar.gz Qt-a69086dd550e97957d985b5ec352f256bb8ddc29.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 5ca37ef..fb55097 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -452,7 +452,7 @@ QImage QGLPixmapData::fillImage(const QColor &color) const if (pixelType() == BitmapType) { img = QImage(w, h, QImage::Format_MonoLSB); - img.setNumColors(2); + img.setColorCount(2); img.setColor(0, QColor(Qt::color0).rgba()); img.setColor(1, QColor(Qt::color1).rgba()); |