diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
| commit | a35186a00ed789ac98c193c4ded2bab62f2a018a (patch) | |
| tree | 393311979e198e8d081c45711fb009c521c6356e /src/gui/painting/qpainter.cpp | |
| parent | 2acc883b3a339b716da9249a1366b08225acbd8a (diff) | |
| parent | 52a65fde8e97f1f6dc26192058fadc1d2275983a (diff) | |
| download | Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.zip Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.gz Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 3bcaf8c..075c457 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -708,13 +708,14 @@ void QPainterPrivate::updateEmulationSpecifier(QPainterState *s) bool penTextureAlpha = false; if (penBrush.style() == Qt::TexturePattern) penTextureAlpha = qHasPixmapTexture(penBrush) - ? penBrush.texture().hasAlpha() + ? (penBrush.texture().depth() > 1) && penBrush.texture().hasAlpha() : penBrush.textureImage().hasAlphaChannel(); bool brushTextureAlpha = false; - if (s->brush.style() == Qt::TexturePattern) + if (s->brush.style() == Qt::TexturePattern) { brushTextureAlpha = qHasPixmapTexture(s->brush) - ? s->brush.texture().hasAlpha() + ? (s->brush.texture().depth() > 1) && s->brush.texture().hasAlpha() : s->brush.textureImage().hasAlphaChannel(); + } if (((penBrush.style() == Qt::TexturePattern && penTextureAlpha) || (s->brush.style() == Qt::TexturePattern && brushTextureAlpha)) && !engine->hasFeature(QPaintEngine::MaskedBrush)) |