diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 17:55:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 17:55:41 (GMT) |
| commit | fc5d4032c2bc9f93dc1ae9e4c8b31d4968f672cb (patch) | |
| tree | 574d11a388d8655c0575f4a9fb10e136638358fd /src/network/access/qnetworkaccessdebugpipebackend.cpp | |
| parent | 198d903fa18d9f1d51615974d71de8236e97c2cd (diff) | |
| parent | 551a8648b93055afa92c2938af5cede7495fd7f5 (diff) | |
| download | Qt-fc5d4032c2bc9f93dc1ae9e4c8b31d4968f672cb.zip Qt-fc5d4032c2bc9f93dc1ae9e4c8b31d4968f672cb.tar.gz Qt-fc5d4032c2bc9f93dc1ae9e4c8b31d4968f672cb.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:
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
Diffstat (limited to 'src/network/access/qnetworkaccessdebugpipebackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessdebugpipebackend.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index cd077e7..5f99f84 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -278,12 +278,6 @@ void QNetworkAccessDebugPipeBackend::socketConnected() { } -bool QNetworkAccessDebugPipeBackend::waitForDownstreamReadyRead(int ms) -{ - Q_UNUSED(ms); - qCritical("QNetworkAccess: Debug pipe backend does not support waitForReadyRead()"); - return false; -} #endif |