Switch from QImage to QPixmap, to allow OpenVG optimization.

Switch QFxPixmap to use QPixmapCache, not own partial QImage cache.
OpenGL prefers QImage for optimization, but that optimization is only
partially preserved (QFxPixmap deals ONLY with QPixmap now).
Opaque QFxPixmap no longer available.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/fx/qfxblendedimage.cpp b/src/declarative/fx/qfxblendedimage.cpp
index 79b8e41..56b25ea 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;
     }