diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 02:50:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 02:50:22 (GMT) |
| commit | 80eb06b6e95ecf0b88534f15ddd9c6c892c08980 (patch) | |
| tree | 65b33c000f5a9c96b3a37a5a41b4aeb6664901e1 /src | |
| parent | 25d3e2f54ba522370576652e8006588c143bfecf (diff) | |
| parent | 6acbf6dce98903310023284e27a65c19f9a829bc (diff) | |
| download | Qt-80eb06b6e95ecf0b88534f15ddd9c6c892c08980.zip Qt-80eb06b6e95ecf0b88534f15ddd9c6c892c08980.tar.gz Qt-80eb06b6e95ecf0b88534f15ddd9c6c892c08980.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make SourceOver work properly in Qt/DirectFB
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index d5f0d42..4869eba 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -978,7 +978,7 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m break; case QPainter::CompositionMode_SourceOver: compositionModeStatus &= ~PorterDuff_AlwaysBlend; - surface->SetPorterDuff(surface, DSPD_SRC_OVER); + surface->SetPorterDuff(surface, DSPD_NONE); break; case QPainter::CompositionMode_DestinationOver: surface->SetPorterDuff(surface, DSPD_DST_OVER); |