diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 15:28:04 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 15:28:04 (GMT) |
| commit | 8ce849b79efeec5cee951846292c7f93c494a612 (patch) | |
| tree | fb3505580fee5e3b51d65b28d488218a9b212110 /src/network/access | |
| parent | 9e9afc266e501aaeb57a9c7e3cf45d97812e93b3 (diff) | |
| download | Qt-8ce849b79efeec5cee951846292c7f93c494a612.zip Qt-8ce849b79efeec5cee951846292c7f93c494a612.tar.gz Qt-8ce849b79efeec5cee951846292c7f93c494a612.tar.bz2 | |
Use TCP_LOCALSOCKET on INTEGRITY
Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/network/access')
| -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 d35f0ce..2040b01 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_INTEGRITY) p = file->map(file->pos(), size); #endif if (p) { |