summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxtextedit_p.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/qfxtextedit_p.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/qfxtextedit_p.h')
-rw-r--r--src/declarative/fx/qfxtextedit_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index 78b0018..9f26b10 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -89,8 +89,8 @@ public:
#if defined(QFX_RENDER_OPENGL)
GLTexture texture;
#endif
- QSimpleCanvasConfig::Image imgCache;
- QImage imgStyleCache;
+ QPixmap imgCache;
+ QPixmap imgStyleCache;
QFxTextEdit::HAlignment hAlign;
QFxTextEdit::VAlignment vAlign;
bool dirty;