diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-10 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-10 23:00:13 (GMT) |
| commit | abbdc58ffd2e41b907b8cbb10805a7b3e43f4c7a (patch) | |
| tree | 53f84b2fbe6d75cd2087eb1a5fa4cbe19a827bc0 /src | |
| parent | 3ad6fef72055f7f6912fd66e4be13d65e8875638 (diff) | |
| parent | d8fb96128d9cc9c38da466ef125c1a547ce20c8c (diff) | |
| download | Qt-abbdc58ffd2e41b907b8cbb10805a7b3e43f4c7a.zip Qt-abbdc58ffd2e41b907b8cbb10805a7b3e43f4c7a.tar.gz Qt-abbdc58ffd2e41b907b8cbb10805a7b3e43f4c7a.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -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) |