Smooth the rendering in the tiles, not of the tiles.

Turn smoothing on in webbrowsser demo.

2 files changed, 4 insertions, 12 deletions

diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 6217019..9a8af29 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -190,7 +190,7 @@ Item {
                 }
 
                 url: fixUrl(WebBrowser.urlString)
-                smooth: false
+                smooth: true
                 fillColor: "white"
                 focus: true
 
diff --git a/src/declarative/fx/qfxpainteditem.cpp b/src/declarative/fx/qfxpainteditem.cpp
index 695236d..cbd00cf 100644
--- a/src/declarative/fx/qfxpainteditem.cpp
+++ b/src/declarative/fx/qfxpainteditem.cpp
@@ -208,12 +208,6 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge
 
     ++inpaint;
 
-    bool oldAntiAliasing = p->testRenderHint(QPainter::Antialiasing);
-    bool oldSmoothPixmap = p->testRenderHint(QPainter::SmoothPixmapTransform);
-    if (oldAntiAliasing)
-        p->setRenderHints(QPainter::Antialiasing, false); // cannot stitch properly otherwise
-    if (d->smooth)
-        p->setRenderHints(QPainter::SmoothPixmapTransform, true);
     QRectF clipf = p->clipRegion().boundingRect();
     if (clipf.isEmpty())
         clipf = mapToScene(content).boundingRect(); // ### Inefficient: Maps toScene and then fromScene
@@ -234,6 +228,7 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge
             if (!d->cachefrozen) {
                 if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) {
                     QPainter qp(&d->imagecache[i]->image);
+                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth);
                     qp.translate(-area.x(), -area.y());
                     if (d->fillColor.isValid())
                         qp.fillRect(d->imagecache[i]->dirty,d->fillColor);
@@ -280,6 +275,8 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge
                     img.fill(d->fillColor);
                 {
                     QPainter qp(&img);
+                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+
                     qp.translate(-r.x(),-r.y());
                     drawContents(&qp, r);
                 }
@@ -296,11 +293,6 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge
         }
     }
 
-    if (oldAntiAliasing)
-        p->setRenderHints(QPainter::Antialiasing, oldAntiAliasing);
-    if (d->smooth)
-        p->setRenderHints(QPainter::SmoothPixmapTransform, oldSmoothPixmap);
-
     if (inpaint_clearcache) {
         clearCache();
         inpaint_clearcache = 0;