Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 10 insertions, 5 deletions

diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 40389c4..58d597a 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -336,7 +336,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);
 
@@ -428,8 +429,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);
+    }
 }
 #elif defined(QFX_RENDER_OPENGL)
 uint QFxImage::glSimpleItemData(float *vertices, float *texVertices,
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index a679532..f02a176 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -830,7 +830,8 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
 
                     if (n.type == QmlBasicScriptNodeCache::Invalid || state == Reset) {
                         context->engine()->d_func()->loadCache(n, QLatin1String(id), static_cast<QmlContextPrivate*>(context->d_ptr));
-                        state = Incremental;
+                        if (state != Reset)
+                            state = Incremental;
                     }
 
                     if(!n.isValid())
@@ -855,7 +856,8 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                     } else if (n.type == QmlBasicScriptNodeCache::Invalid || state == Reset) {
                         context->engine()->d_func()->fetchCache(n, QLatin1String(id), obj);
                         guard(n);
-                        state = Incremental;
+                        if (state != Reset)
+                            state = Incremental;
                     } else if (!valid(n, obj)) {
                         clearCache(dataCache);
                         *cached = Reset;