summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxpixmap.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-05-25 23:01:50 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-05-25 23:01:50 (GMT)
commit07929fef22cb9cffc059f949e216ec585e0e7466 (patch)
treeefb8e9b77a42e528c4e58b9346c773bb3c91688a /src/declarative/fx/qfxpixmap.h
parentf8efe236ec6cb0a8f162f74c9af9682705ff13ed (diff)
downloadQt-07929fef22cb9cffc059f949e216ec585e0e7466.zip
Qt-07929fef22cb9cffc059f949e216ec585e0e7466.tar.gz
Qt-07929fef22cb9cffc059f949e216ec585e0e7466.tar.bz2
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.
Diffstat (limited to 'src/declarative/fx/qfxpixmap.h')
-rw-r--r--src/declarative/fx/qfxpixmap.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/declarative/fx/qfxpixmap.h b/src/declarative/fx/qfxpixmap.h
index fd56ee4..ae693c1 100644
--- a/src/declarative/fx/qfxpixmap.h
+++ b/src/declarative/fx/qfxpixmap.h
@@ -71,16 +71,10 @@ public:
bool isNull() const;
- bool opaque() const;
- void setOpaque(bool);
-
int width() const;
int height() const;
- QPixmap pixmap() const;
- void setPixmap(const QPixmap &pix);
-
- operator const QSimpleCanvasConfig::Image &() const;
+ operator const QPixmap &() const;
private:
QFxPixmapPrivate *d;