diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-26 16:06:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-26 16:06:10 (GMT) |
| commit | 936e747cf4556ae86591455b441fcf30baddc2b4 (patch) | |
| tree | cabae1a069ba6f8d8dbb09628fd225d670a03395 /src/gui/image | |
| parent | cce89db1e2555cbca8fc28072e1c6dd737cec6c4 (diff) | |
| parent | d0787ad401a8e214b10ee3a78f150ed94d94182c (diff) | |
| download | Qt-936e747cf4556ae86591455b441fcf30baddc2b4.zip Qt-936e747cf4556ae86591455b441fcf30baddc2b4.tar.gz Qt-936e747cf4556ae86591455b441fcf30baddc2b4.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmapcache.cpp | 4 |
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 |