diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:49:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:49:48 (GMT) |
| commit | 2707cdd482c975e58a4736ac85c32af45435f561 (patch) | |
| tree | ba81c9b17dfdbfb5ab0b5dbd8d6c836cac1b64c3 /src | |
| parent | 4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae (diff) | |
| parent | eab9b566d8e7cd98dd69cbcfc39393192a9e6efa (diff) | |
| download | Qt-2707cdd482c975e58a4736ac85c32af45435f561.zip Qt-2707cdd482c975e58a4736ac85c32af45435f561.tar.gz Qt-2707cdd482c975e58a4736ac85c32af45435f561.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
CLucene: Use the right delete operator.
Examples: Fix compilation with namespace.
fix build with QT_NO_BEARERMANAGEMENT
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkaccessdatabackend.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp index 74aebdb..d2db2f2 100644 --- a/src/network/access/qnetworkaccessdatabackend.cpp +++ b/src/network/access/qnetworkaccessdatabackend.cpp @@ -124,7 +124,11 @@ bool QNetworkAccessDataBackend::waitForUpstreamBytesWritten(int) bool QNetworkAccessDataBackend::processRequestSynchronously() { +#ifndef QT_NO_BEARERMANAGEMENT start(); +#else + open(); +#endif return true; } |