summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-07-01 23:11:50 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-07-01 23:27:38 (GMT)
commit765a6676e04b19a9af298096f9d4f0a6e571ccbd (patch)
treedf3aa461ac3c27a12cf00801da6831677f78942c
parent3e303b195a79d555b907a6badbe4df5d4b8686b4 (diff)
downloadQt-765a6676e04b19a9af298096f9d4f0a6e571ccbd.zip
Qt-765a6676e04b19a9af298096f9d4f0a6e571ccbd.tar.gz
Qt-765a6676e04b19a9af298096f9d4f0a6e571ccbd.tar.bz2
Make sure we check the right device
Also. Make sure to call QRasterPaintEngine::end() Reviewed-by: Donald <qt-info@nokia.com>
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index bac9f09..e4ce230 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -299,7 +299,7 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device)
d->lastLockedHeight = -1;
if (device->devType() == QInternal::CustomRaster) {
d->dfbDevice = static_cast<QDirectFBPaintDevice*>(device);
- } else if (d->device->devType() == QInternal::Pixmap) {
+ } else if (device->devType() == QInternal::Pixmap) {
QPixmapData *data = static_cast<QPixmap*>(device)->pixmapData();
Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
QDirectFBPixmapData *dfbPixmapData = static_cast<QDirectFBPixmapData*>(data);
@@ -342,7 +342,7 @@ bool QDirectFBPaintEngine::end()
#endif
d->surface->SetClip(d->surface, NULL);
d->surface = 0;
- return true;
+ return QRasterPaintEngine::end();
}
void QDirectFBPaintEngine::clipEnabledChanged()