diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:12:17 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:12:17 (GMT) |
| commit | 21fef75cd50b00609a803f123cc27ad0ee9ba509 (patch) | |
| tree | ca96462e89b9c4828c7792e62def95e77d69d277 /src/plugins/gfxdrivers | |
| parent | 11303c676166cda3aae33e7e97939e9d2942271f (diff) | |
| parent | 61d1dcea0efa6b0809639b781bb49baf252b3aad (diff) | |
| download | Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.zip Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.gz Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
Diffstat (limited to 'src/plugins/gfxdrivers')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index dba1b51..18754f5 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -202,11 +202,12 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect) } IDirectFBSurface *src = static_cast<const QDirectFBPixmapData*>(data)->directFBSurface(); - const bool hasAlpha = data->hasAlphaChannel(); - format = (hasAlpha + alpha = data->hasAlphaChannel(); + format = (alpha ? QDirectFBScreen::instance()->alphaPixmapFormat() : QDirectFBScreen::instance()->pixelFormat()); + dfbSurface = screen->createDFBSurface(rect.size(), format, QDirectFBScreen::TrackSurface); if (!dfbSurface) { @@ -215,7 +216,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect) return; } - if (hasAlpha) { + if (alpha) { dfbSurface->Clear(dfbSurface, 0, 0, 0, 0); dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_BLEND_ALPHACHANNEL); } else { |