diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-25 23:01:50 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-25 23:01:50 (GMT) |
| commit | 07929fef22cb9cffc059f949e216ec585e0e7466 (patch) | |
| tree | efb8e9b77a42e528c4e58b9346c773bb3c91688a /src/declarative/fx/qfxtext_p.h | |
| parent | f8efe236ec6cb0a8f162f74c9af9682705ff13ed (diff) | |
| download | Qt-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/qfxtext_p.h')
| -rw-r--r-- | src/declarative/fx/qfxtext_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h index 8bb3142..dfaef63 100644 --- a/src/declarative/fx/qfxtext_p.h +++ b/src/declarative/fx/qfxtext_p.h @@ -94,8 +94,8 @@ public: void drawOutline(); void drawOutline(int yOffset); - QImage wrappedTextImage(bool drawStyle); - QImage richTextImage(bool drawStyle); + QPixmap wrappedTextImage(bool drawStyle); + QPixmap richTextImage(bool drawStyle); QSize setupTextLayout(QTextLayout *layout); QString text; @@ -118,8 +118,8 @@ public: #if defined(QFX_RENDER_OPENGL) GLTexture tex; #endif - QSimpleCanvasConfig::Image imgCache; - QImage imgStyleCache; + QPixmap imgCache; + QPixmap imgStyleCache; QFxText::HAlignment hAlign; QFxText::VAlignment vAlign; Qt::TextElideMode elideMode; |