diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 01:50:16 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 01:50:16 (GMT) |
| commit | b8fba323c817a00df3c3639eb172104cf68d259d (patch) | |
| tree | 437edb5e7c0672636f2bcc7fa3af59665b99d0d6 /src/declarative/fx/qfximage.cpp | |
| parent | c1283b68d5b02afb5f225d455ae057753b91a5b9 (diff) | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| download | Qt-b8fba323c817a00df3c3639eb172104cf68d259d.zip Qt-b8fba323c817a00df3c3639eb172104cf68d259d.tar.gz Qt-b8fba323c817a00df3c3639eb172104cf68d259d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' into kinetic-declarativeui-gv
Conflicts:
src/declarative/canvas/qsimplecanvasitem.cpp
src/declarative/canvas/qsimplecanvasitem_p.h
src/declarative/fx/qfxwebview.cpp
Diffstat (limited to 'src/declarative/fx/qfximage.cpp')
| -rw-r--r-- | src/declarative/fx/qfximage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 48957e5..fa56ee1 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -311,7 +311,8 @@ void QFxImage::paintContents(QPainter &p) if (d->pix.isNull()) return; - QPainter::RenderHints oldHints = p.renderHints(); + bool oldAA = p.testRenderHint(QPainter::Antialiasing); + bool oldSmooth = p.testRenderHint(QPainter::SmoothPixmapTransform); if (d->smooth) p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth); @@ -403,8 +404,10 @@ void QFxImage::paintContents(QPainter &p) QRect(pix.width()-sgr, pix.height() - sgb, sgr, sgb)); } - if (d->smooth) - p.setRenderHints(oldHints); + if (d->smooth) { + p.setRenderHint(QPainter::Antialiasing, oldAA); + p.setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth); + } } QString QFxImage::propertyInfo() const |