summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-26 07:35:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-26 07:35:03 (GMT)
commitd0787ad401a8e214b10ee3a78f150ed94d94182c (patch)
tree91d8bbde849498ed8e4eba81763836c320976ea9 /src/gui/image
parent87c03292dce257f1f72d3fdc4e9457f1e1269ce2 (diff)
parent4226a34e4e2f8739b238b9f9b1769e2fd4fabd7e (diff)
downloadQt-d0787ad401a8e214b10ee3a78f150ed94d94182c.zip
Qt-d0787ad401a8e214b10ee3a78f150ed94d94182c.tar.gz
Qt-d0787ad401a8e214b10ee3a78f150ed94d94182c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Set QPixmapCache default limit to 10MB on Symbian.
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmapcache.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 41fc6e9..ae772d8 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -91,9 +91,7 @@ QT_BEGIN_NAMESPACE
\sa QCache, QPixmap
*/
-#if defined(Q_OS_SYMBIAN)
-static int cache_limit = 1024; // 1048 KB cache limit for symbian
-#elif defined(Q_WS_QWS) || defined(Q_WS_WINCE)
+#if defined(Q_WS_QWS) || defined(Q_WS_WINCE)
static int cache_limit = 2048; // 2048 KB cache limit for embedded
#else
static int cache_limit = 10240; // 10 MB cache limit for desktop