diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:56:46 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:56:46 (GMT) |
| commit | b189057d5105b3aae2049d2182ecfceb0399f041 (patch) | |
| tree | 2745c01760617dbc9a9d211f412a54ccd262250a /src/declarative/fx/qfxblendedimage.cpp | |
| parent | 2eb60d000f3666fc42ba2b7305ca52556497c86a (diff) | |
| parent | 07929fef22cb9cffc059f949e216ec585e0e7466 (diff) | |
| download | Qt-b189057d5105b3aae2049d2182ecfceb0399f041.zip Qt-b189057d5105b3aae2049d2182ecfceb0399f041.tar.gz Qt-b189057d5105b3aae2049d2182ecfceb0399f041.tar.bz2 | |
Merge branch 'kinetic-declarativeui-pixmapopt' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxblendedimage.cpp')
| -rw-r--r-- | src/declarative/fx/qfxblendedimage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxblendedimage.cpp b/src/declarative/fx/qfxblendedimage.cpp index 73eb3c4..4c6eb58 100644 --- a/src/declarative/fx/qfxblendedimage.cpp +++ b/src/declarative/fx/qfxblendedimage.cpp @@ -192,9 +192,9 @@ void QFxBlendedImage::paintContents(QPainter &p) } if (_blend < 0.75) - p.drawImage(0, 0, primPix); + p.drawPixmap(0, 0, primPix); else - p.drawImage(0, 0, secPix); + p.drawPixmap(0, 0, secPix); if (_smooth) { p.restore(); @@ -212,8 +212,8 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) if (dirty) { prim.clear(); sec.clear(); - prim.setImage(primPix); - sec.setImage(secPix); + prim.setImage(primPix.toImage()); + sec.setImage(secPix.toImage()); dirty = false; } |