Re: Qt 4.5.1 patches

[Sverre Froyen <sverre%viewmark.com@localhost>]

I've already sent this to Matthias.  This copy is for the lists.

On Fri June 26 2009 11:13:22 Matthias Drochner wrote:
> sverre%viewmark.com@localhost said:
> > Do you mean 958945 and 971295?
>
> Ah yes, sorry for the confusion.
> I meant those two which were marked as "applied upstream".
> The other ones seemed to deal with details of the local
> qt copy by kde.

Patches 958945 and 971295 are sufficient  (I see no difference without the 
other two).  I'm including the two new qt4-libs patches.

Regards,
Sverre

--- ./src/svg/qsvgstyle.cpp.orig        2009-06-24 21:07:23.000000000 -0600
+++ ./src/svg/qsvgstyle.cpp     2009-06-24 21:09:44.000000000 -0600
@@ -808,6 +808,7 @@
                     static_cast<QSvgGradientStyle*>(prop);
                 st->resolveStops();
                 m_gradient->setStops(st->qgradient()->stops());
+                m_gradientStopsSet = st->gradientStopsSet();
             }
         }
         m_link = QString();

--- src/gui/image/qpixmapcache.cpp.orig 2009-06-26 11:31:40.000000000 -0600
+++ src/gui/image/qpixmapcache.cpp      2009-06-26 11:31:45.000000000 -0600
@@ -187,6 +187,11 @@
         cacheKeys.insert(key, cacheKey);
         return true;
     }
+    qint64 oldCacheKey = cacheKeys.value(key, -1);
+    //If for the same key we add already a pixmap we should delete it
+    if (oldCacheKey != -1)
+        QCache<qint64, QDetachedPixmap>::remove(oldCacheKey);
+
     bool success = QCache<qint64, QDetachedPixmap>::insert(cacheKey, new 
QDetachedPixmap(pixmap), cost);
     if (success) {
         cacheKeys.insert(key, cacheKey);