diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-10 23:13:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-10 23:13:25 (GMT) |
| commit | ed5529d5cc7d97b04c181cc39dcb5d07def0156c (patch) | |
| tree | 53f84b2fbe6d75cd2087eb1a5fa4cbe19a827bc0 | |
| parent | 303c93869e5f669cc070858accc9779adabb2740 (diff) | |
| parent | abbdc58ffd2e41b907b8cbb10805a7b3e43f4c7a (diff) | |
| download | Qt-ed5529d5cc7d97b04c181cc39dcb5d07def0156c.zip Qt-ed5529d5cc7d97b04c181cc39dcb5d07def0156c.tar.gz Qt-ed5529d5cc7d97b04c181cc39dcb5d07def0156c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
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) |