diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-28 10:20:07 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-10-28 10:27:14 (GMT) |
| commit | 080fb267e54cd17697d0a7dbe00449c17d461a11 (patch) | |
| tree | 1db7100138939e4174a87cceef7220f759bbdbd4 | |
| parent | 7a0cdd851d8ea1e2b51d3b91dbb69a67d379b794 (diff) | |
| download | Qt-080fb267e54cd17697d0a7dbe00449c17d461a11.zip Qt-080fb267e54cd17697d0a7dbe00449c17d461a11.tar.gz Qt-080fb267e54cd17697d0a7dbe00449c17d461a11.tar.bz2 | |
Symbian - disable memory mapping in QNetworkDiskCache
The implementation of memory mapped files in Open C requires
munmap to be called from the same thread as mmap. As the
QIODevice can be handed off to another thread, this breaks
application code that works on other operating systems.
Task-number: QT-5309
Reviewed-by: Tadaaki Matsumoto
| -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 3b18fe8..9d91a8f 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) { |