diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
| commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
| tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/network | |
| parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
| parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkdiskcache.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkfunctions_wince.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index 04ba45e90e..86dd57b353 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE and ends in ".cache". Data is written to disk only in insert() and updateMetaData(). - Currently you can not share the same cache files with more then + Currently you cannot share the same cache files with more than one disk cache. QNetworkDiskCache by default limits the amount of space that the cache will diff --git a/src/network/kernel/qnetworkfunctions_wince.h b/src/network/kernel/qnetworkfunctions_wince.h index ebbdebb2f1..09caab06eb 100644 --- a/src/network/kernel/qnetworkfunctions_wince.h +++ b/src/network/kernel/qnetworkfunctions_wince.h @@ -42,6 +42,10 @@ #ifndef QNETWORKFUNCTIONS_WINCE_H #define QNETWORKFUNCTIONS_WINCE_H +#if 0 +#pragma qt_sync_stop_processing +#endif + #ifdef Q_OS_WINCE #include <qt_windows.h> |