diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-10 10:44:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-10 10:44:20 (GMT) |
| commit | d8fb96128d9cc9c38da466ef125c1a547ce20c8c (patch) | |
| tree | 283db954e8624e1486c89ab7dfbb2402b41700ff | |
| parent | 54fc0f9f4c00ec53339b9c4c6b18e4c066b11a0b (diff) | |
| parent | c322351711d8c907184939032b226efc273988eb (diff) | |
| download | Qt-d8fb96128d9cc9c38da466ef125c1a547ce20c8c.zip Qt-d8fb96128d9cc9c38da466ef125c1a547ce20c8c.tar.gz Qt-d8fb96128d9cc9c38da466ef125c1a547ce20c8c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
HTTP backend: invoke methods directly for synchronous requests
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index 7d49648..8a247ce 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -961,9 +961,9 @@ bool QNetworkAccessHttpBackend::sendCacheContents(const QNetworkCacheMetaData &m // This needs to be emitted in the event loop because it can be reached at // the direct code path of qnam.get(...) before the user has a chance // to connect any signals. - QMetaObject::invokeMethod(this, "metaDataChanged", Qt::QueuedConnection); + QMetaObject::invokeMethod(this, "metaDataChanged", isSynchronous() ? Qt::DirectConnection : Qt::QueuedConnection); qRegisterMetaType<QIODevice*>("QIODevice*"); - QMetaObject::invokeMethod(this, "writeDownstreamData", Qt::QueuedConnection, Q_ARG(QIODevice*, contents)); + QMetaObject::invokeMethod(this, "writeDownstreamData", isSynchronous() ? Qt::DirectConnection : Qt::QueuedConnection, Q_ARG(QIODevice*, contents)); #if defined(QNETWORKACCESSHTTPBACKEND_DEBUG) |