diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 02:38:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 02:38:41 (GMT) |
| commit | c23a5c09d6b8896f4b61164a2dc61ce6ac3f5edb (patch) | |
| tree | a6806b2eb0f443eba9ce4f96cc9f508e5530b62d /src/gui/painting/qpainter.cpp | |
| parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) | |
| parent | 2f389a95f5b9e4c7130aa333586d803b639bf259 (diff) | |
| download | Qt-c23a5c09d6b8896f4b61164a2dc61ce6ac3f5edb.zip Qt-c23a5c09d6b8896f4b61164a2dc61ce6ac3f5edb.tar.gz Qt-c23a5c09d6b8896f4b61164a2dc61ce6ac3f5edb.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add functional Graphics View benchmarks.
Make QCUPSSupport::printerHasPPD() clean up after itself.
document the slowness of QPixmap::hasAlpha()
Speed up custom bitmap brushes on X11 without Xrender support.
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)) |