diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-12 14:59:43 +0100 |
---|---|---|
committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-13 08:40:53 +0000 |
commit | afaf8a1650d405c2e099178ccc61ec8d12a154e9 (patch) | |
tree | febb5725f2579d4b0603cb8613a69cd018572c91 /src/network | |
parent | adc3ef97d7b1e93ab2b2081134855f8cccd0f166 (diff) |
Remove #ifndef QT_NO_HTTP that does nothing
Change-Id: I9d6771e9da64e59f8a038dd3b506e6293fcb62c0
Reviewed-by: Jan Kundrát <jkt@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 5af3bb37be..3f096cd3ee 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -402,19 +402,11 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const } else { // for HTTP, we want to send out the request as fast as possible to the network, without // invoking methods in a QueuedConnection -#ifndef QT_NO_HTTP - if (backend && backend->isSynchronous()) { - _q_startOperation(); - } else { - QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection); - } -#else if (backend && backend->isSynchronous()) _q_startOperation(); else QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection); -#endif // QT_NO_HTTP - } + } } void QNetworkReplyImplPrivate::backendNotify(InternalNotifications notification) @@ -1113,11 +1105,7 @@ bool QNetworkReplyImplPrivate::migrateBackend() backend->setResumeOffset(bytesDownloaded); } -#ifndef QT_NO_HTTP - QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection); -#else QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection); -#endif // QT_NO_HTTP return true; } |