summaryrefslogtreecommitdiffstats
path: root/src/gui/embedded
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-05-11 07:21:54 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-05-11 07:31:37 (GMT)
commit3822cd597fc481acb2a4de324c005c23ce8e78cd (patch)
tree91443af04295cb7a604a87ff2968641d7f86a353 /src/gui/embedded
parenta93e6cbae8dfa71aad2da9a69f5320bd44bc8dab (diff)
downloadQt-3822cd597fc481acb2a4de324c005c23ce8e78cd.zip
Qt-3822cd597fc481acb2a4de324c005c23ce8e78cd.tar.gz
Qt-3822cd597fc481acb2a4de324c005c23ce8e78cd.tar.bz2
Fix QWS build breakage
QScreen uses QSpanData::setup, so broke because of API change. Reviewed-by: sroedal
Diffstat (limited to 'src/gui/embedded')
-rw-r--r--src/gui/embedded/qscreen_qws.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
index ff48403..a82edbb 100644
--- a/src/gui/embedded/qscreen_qws.cpp
+++ b/src/gui/embedded/qscreen_qws.cpp
@@ -49,6 +49,7 @@
#include "qpixmap.h"
#include "qvarlengtharray.h"
#include "qwsdisplay_qws.h"
+#include "qpainter.h"
#include <private/qdrawhelper_p.h>
#include <private/qpaintengine_raster_p.h>
#include <private/qpixmap_raster_p.h>
@@ -2710,7 +2711,7 @@ void QScreen::compose(int level, const QRegion &exposed, QRegion &blend,
default:
break;
}
- spanData.setup(qwsServer->backgroundBrush(), 256);
+ spanData.setup(qwsServer->backgroundBrush(), 256, QPainter::CompositionMode_SourceOver);
spanData.dx = off.x();
spanData.dy = off.y();
} else if (!surface->isBuffered()) {
@@ -2775,7 +2776,7 @@ void QScreen::paintBackground(const QRegion &r)
rb.prepare(&img);
QSpanData spanData;
spanData.init(&rb, 0);
- spanData.setup(bg, 256);
+ spanData.setup(bg, 256, QPainter::CompositionMode_Source);
spanData.dx = off.x();
spanData.dy = off.y();
Q_ASSERT(spanData.blend);