summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-28 23:31:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-28 23:31:29 (GMT)
commitc0f5eeec92f188381d7f085b2d4f5ea08ecc665c (patch)
treeaf8e77d9c9fd297fd0bc35aa2369fadd3a6bdcde /src/plugins
parent7884b913c006402eded0bfe36053c9c557d8d9d6 (diff)
parent45c4c792c48605de4cbc28637a39bce5a65b1613 (diff)
downloadQt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.zip
Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.tar.gz
Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.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: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index dc74c4e..6d6fb02 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -1025,11 +1025,10 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m
case QPainter::CompositionMode_DestinationOut:
surface->SetPorterDuff(surface, DSPD_DST_OUT);
break;
-#if (Q_DIRECTFB_VERSION >= 0x010209)
case QPainter::CompositionMode_Destination:
- surface->SetPorterDuff(surface, DSPD_DST);
+ surface->SetSrcBlendFunction(surface, DSBF_ZERO);
+ surface->SetDstBlendFunction(surface, DSBF_ONE);
break;
-#endif
#if (Q_DIRECTFB_VERSION >= 0x010000)
case QPainter::CompositionMode_SourceAtop:
surface->SetPorterDuff(surface, DSPD_SRC_ATOP);