diff options
| author | axis <qt-info@nokia.com> | 2011-04-27 12:59:51 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:59:51 +0200 |
| commit | a4a585d2ee907746682846ae6e8a48e19deef469 (patch) | |
| tree | 71df078aa4493c66604f4f31eeb858c9eb3bc041 /src/gui/image/qpixmapcache.cpp | |
| parent | 1c09b529e4aa12cc31b70d07899eac1882710e80 (diff) | |
| parent | 896db169ea224deb96c59ce8af800d019de63f12 (diff) | |
Merge branch 'master' into qtquick2history/qtquick2
Diffstat (limited to 'src/gui/image/qpixmapcache.cpp')
| -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 41fc6e94b4..ae772d8bc3 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 |