aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan A. Suarez Romero <jasuarez@igalia.com>2010-12-03 13:00:49 +0100
committerAdrian Yanes <ext-adrian.yanes@nokia.com>2010-12-03 17:11:48 +0000
commitf33401d7017177314aeb322ca6052506d012bc0a (patch)
tree5806ac5340e94e2817c85e1149d87f8a5ddcafc1
parent9cf47ab1279e521fb586fad0683ce8172db12869 (diff)
Fixes: NB#206822 - application crashes when it is minimized
RevBy: Armin Aberres Details: Do not cache QPixmaps attributes, as they can be freed when reloading a style.
-rw-r--r--src/corelib/style/mstylesheetattribute.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/style/mstylesheetattribute.cpp b/src/corelib/style/mstylesheetattribute.cpp
index cd44203c..02c7b415 100644
--- a/src/corelib/style/mstylesheetattribute.cpp
+++ b/src/corelib/style/mstylesheetattribute.cpp
@@ -644,7 +644,7 @@ bool MStyleSheetAttribute::writeAttribute(const QString &filename,
//only image_id
if (list.size() == 1) {
const QPixmap *pixmap = MTheme::pixmap(list[0]);
- return fillProperty(property, style, cacheOrientation, qVariantFromValue(pixmap));
+ return fillProperty(property, style, cacheOrientation, qVariantFromValue(pixmap), false);
}
//image_id + width + height
else if (list.size() == 3) {
@@ -652,7 +652,7 @@ bool MStyleSheetAttribute::writeAttribute(const QString &filename,
int height = attributeToInt(list[2], &conversionOK, HeightAttribute, orientation);
const QPixmap *pixmap = MTheme::pixmap(list[0], QSize(width, height));
cacheOrientation = (orientation == M::Portrait) ? PortraitFlag : LandscapeFlag;
- return fillProperty(property, style, cacheOrientation, qVariantFromValue(pixmap));
+ return fillProperty(property, style, cacheOrientation, qVariantFromValue(pixmap), false);
}
//no parameters
else if (list.size() == 0) {