diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 14:00:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 14:00:36 (GMT) |
| commit | d888b168932fbdc65881ced1aa55165f286ea6d2 (patch) | |
| tree | 0e24b77785255d4dff8f6a8545c5b373d67449c4 | |
| parent | b089db709ba5e97b444db13a86b7fe2f4f063348 (diff) | |
| parent | a53e579a388c6bca6374b56328622bc8c1e0f138 (diff) | |
| download | Qt-d888b168932fbdc65881ced1aa55165f286ea6d2.zip Qt-d888b168932fbdc65881ced1aa55165f286ea6d2.tar.gz Qt-d888b168932fbdc65881ced1aa55165f286ea6d2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Mac: pixmaps dont treat alpha exactly the same as other platforms
| -rw-r--r-- | src/gui/image/qpixmap_mac.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index 31aa192..f152718 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -413,7 +413,11 @@ void QMacPixmapData::fill(const QColor &fillColor) *(dptr + i) = colr; } } - macSetHasAlpha(fillColor.alpha() != 255); + + // If we had an alpha channel from before, don't + // switch it off. Only go from no alpha to alpha: + if (fillColor.alpha() != 255) + macSetHasAlpha(true); } QPixmap QMacPixmapData::alphaChannel() const |