diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 20:32:43 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 20:32:43 +1000 |
| commit | da8a056dbb0e4b0a65d94857cdd65ddcb8633341 (patch) | |
| tree | d192e221891de8ea6d2c4f94e251b6d4968f7fb9 | |
| parent | 44a8b712a52e4911b0e5ff3fee730bbe416d7ebd (diff) | |
| parent | 080fb267e54cd17697d0a7dbe00449c17d461a11 (diff) | |
| download | qt4-tools-da8a056dbb0e4b0a65d94857cdd65ddcb8633341.tar.gz | |
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:
Symbian - disable memory mapping in QNetworkDiskCache
| -rw-r--r-- | src/network/access/qnetworkdiskcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index 3b18fe8886..9d91a8f88e 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -404,7 +404,7 @@ QIODevice *QNetworkDiskCache::data(const QUrl &url) // ### verify that QFile uses the fd size and not the file name qint64 size = file->size() - file->pos(); const uchar *p = 0; -#ifndef Q_OS_WINCE +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) p = file->map(file->pos(), size); #endif if (p) { |