diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
| commit | c3d5e6703777f294e5af12a0871defd339f1c1ff (patch) | |
| tree | 7bf4bd3416cda1f6f677590efce6f9aec2138721 /src/gui/painting | |
| parent | 4b3953678983b3da925066f464b55340fab3503c (diff) | |
| parent | a0cb1ae902dce0c00dc2de8b92229d66945054c8 (diff) | |
| download | Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.zip Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.gz Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 891f4c2..8d2da69 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -5072,7 +5072,7 @@ static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData) static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData) { -#if defined(QT_QWS_DEPTH_16) +#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast<QSpanData *>(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) |