diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 13:26:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 13:26:41 (GMT) |
| commit | 54869c8727e5403cea866c99a5f83ae9c8533f82 (patch) | |
| tree | 631041adad66a2298177298b56c20028afe19f15 /src/network/access | |
| parent | eedc18d1fdcf7c359916304cbf0b4629bbf70c84 (diff) | |
| parent | 86b42367d2ded7d3db06b1e087d8112a3171081a (diff) | |
| download | Qt-54869c8727e5403cea866c99a5f83ae9c8533f82.zip Qt-54869c8727e5403cea866c99a5f83ae9c8533f82.tar.gz Qt-54869c8727e5403cea866c99a5f83ae9c8533f82.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
fix autotest on windows (again)
fix autotest on windows
Ammend last INTEGRITY fix
Fix qmake build on Windows
fix test for QtLighthouse
add test for suppressing warnings in moc
Ammend INTEGRITY fixes
Store property editor's column positions in settings
add gsm to connectable bearer for networkmanager.
Fix license headers
add missing include
Silence GHS compiler
Run on INTEGRITY
Fix compilation on INTEGRITY
Do not link with libm on INTEGRITY
Add a "-nn" option to moc
Add Documentation about INTEGRITY RTOS
List the INTEGRITY drivers as well
Use TCP_LOCALSOCKET on INTEGRITY
Compile for systems without mmap
...
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) { |