diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
| commit | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (patch) | |
| tree | 7e41a16587d903498fbb1ca71cd286a9ba156241 /src/opengl/qpixmapdata_gl.cpp | |
| parent | f656909791819b3f033f9ec1bd0de524b92919e2 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.zip Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.gz Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6-platform
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()); |