Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

3 files changed, 30 insertions, 31 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index ed1d271..da01eb5 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -897,12 +897,10 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
 
             timeline.reset(data.move);
             if (viewPos != position()) {
-                if (fixupDuration) {
+                if (fixupDuration)
                     timeline.move(data.move, -viewPos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-                } else {
-                    data.move.setValue(-viewPos);
-                    q->viewportMoved();
-                }
+                else
+                    timeline.set(data.move, -viewPos);
             }
             vTime = timeline.time();
         }
@@ -911,12 +909,10 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         qreal dist = qAbs(data.move.value() - pos);
         if (dist > 0) {
             timeline.reset(data.move);
-            if (fixupDuration) {
+            if (fixupDuration)
                 timeline.move(data.move, pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-            } else {
-                data.move.setValue(pos);
-                q->viewportMoved();
-            }
+            else
+                timeline.set(data.move, pos);
             vTime = timeline.time();
         }
     } else {
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 3f2b4ce..4848008 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1144,12 +1144,10 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
 
             timeline.reset(data.move);
             if (viewPos != position()) {
-                if (fixupDuration) {
+                if (fixupDuration)
                     timeline.move(data.move, -viewPos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-                } else {
-                    data.move.setValue(-viewPos);
-                    q->viewportMoved();
-                }
+                else
+                    timeline.set(data.move, -viewPos);
             }
             vTime = timeline.time();
         }
@@ -1159,12 +1157,10 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
             qreal dist = qAbs(data.move + pos);
             if (dist > 0) {
                 timeline.reset(data.move);
-                if (fixupDuration) {
+                if (fixupDuration)
                     timeline.move(data.move, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-                } else {
-                    data.move.setValue(-pos);
-                    q->viewportMoved();
-                }
+                else
+                    timeline.set(data.move, -pos);
                 vTime = timeline.time();
             }
         }
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 7a6a73f..ca21a0c 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -196,9 +196,10 @@ public:
     static QPixmapCache::KeyData* getKeyData(QPixmapCache::Key *key);
 
     QList< QPair<QString,QPixmap> > allPixmaps() const;
-    void flushDetachedPixmaps(bool nt);
+    bool flushDetachedPixmaps(bool nt);
 
 private:
+    enum { soon_time = 10000, flush_time = 30000 };
     int *keyArray;
     int theid;
     int ps;
@@ -236,38 +237,44 @@ QPMCache::~QPMCache()
   cleaning-up, and to not cut down the size of the cache while the
   cache is in active use.
 
-  When the last pixmap has been deleted from the cache, kill the
-  timer so Qt won't keep the CPU from going into sleep mode.
+  When the last detached pixmap has been deleted from the cache, kill the
+  timer so Qt won't keep the CPU from going into sleep mode. Currently
+  the timer is not restarted when the pixmap becomes unused, but it does
+  restart once something else is added (i.e. the cache space is actually needed).
+
+  Returns true if any were removed.
 */
-void QPMCache::flushDetachedPixmaps(bool nt)
+bool QPMCache::flushDetachedPixmaps(bool nt)
 {
     int mc = maxCost();
     setMaxCost(nt ? totalCost() * 3 / 4 : totalCost() -1);
     setMaxCost(mc);
     ps = totalCost();
 
+    bool any = false;
     QHash<QString, QPixmapCache::Key>::iterator it = cacheKeys.begin();
     while (it != cacheKeys.end()) {
         if (!contains(it.value())) {
             releaseKey(it.value());
             it = cacheKeys.erase(it);
+            any = true;
         } else {
             ++it;
         }
     }
+
+    return any;
 }
 
 void QPMCache::timerEvent(QTimerEvent *)
 {
     bool nt = totalCost() == ps;
-    flushDetachedPixmaps(nt);
-
-    if (!size()) {
+    if (!flushDetachedPixmaps(nt)) {
         killTimer(theid);
         theid = 0;
     } else if (nt != t) {
         killTimer(theid);
-        theid = startTimer(nt ? 10000 : 30000);
+        theid = startTimer(nt ? soon_time : flush_time);
         t = nt;
     }
 }
@@ -315,7 +322,7 @@ bool QPMCache::insert(const QString& key, const QPixmap &pixmap, int cost)
     if (success) {
         cacheKeys.insert(key, cacheKey);
         if (!theid) {
-            theid = startTimer(30000);
+            theid = startTimer(flush_time);
             t = false;
         }
     } else {
@@ -331,7 +338,7 @@ QPixmapCache::Key QPMCache::insert(const QPixmap &pixmap, int cost)
     bool success = QCache<QPixmapCache::Key, QPixmapCacheEntry>::insert(cacheKey, new QPixmapCacheEntry(cacheKey, pixmap), cost);
     if (success) {
         if (!theid) {
-            theid = startTimer(30000);
+            theid = startTimer(flush_time);
             t = false;
         }
     } else {
@@ -352,7 +359,7 @@ bool QPMCache::replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int
     bool success = QCache<QPixmapCache::Key, QPixmapCacheEntry>::insert(cacheKey, new QPixmapCacheEntry(cacheKey, pixmap), cost);
     if (success) {
         if(!theid) {
-            theid = startTimer(30000);
+            theid = startTimer(flush_time);
             t = false;
         }
         const_cast<QPixmapCache::Key&>(key) = cacheKey;