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/qfxwebview.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/qfxwebview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxwebview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 4c35cae..bfccd34 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -161,7 +161,7 @@ public: int age; QRect area; #if defined(QFX_RENDER_QPAINTER) - QSimpleCanvasConfig::Image image; + QPixmap image; #else GLTexture image; #endif |