diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 11:02:13 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 11:02:13 +0200 |
| commit | ef19008e67b421b7597d8a6bfcd9dab99fe01e48 (patch) | |
| tree | 238c7fd1ba202a8fbf5f2db43cec46c95a92d88f | |
| parent | 9789cdb6c3a6070fffb4644ce52cd176f44c3d48 (diff) | |
| parent | bcafe4a3dde9986ecfdeea43dc592b6f54134893 (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed alpha check for mono images.
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index d46f40e4e0..473f93ae5b 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -272,6 +272,8 @@ bool QImageData::checkForAlphaPixels() const switch (format) { + case QImage::Format_Mono: + case QImage::Format_MonoLSB: case QImage::Format_Indexed8: has_alpha_pixels = has_alpha_clut; break; |