diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 09:36:35 +0000 |
| commit | 3fd641c3141b49b334dcbdb1a25649525445b724 (patch) | |
| tree | d0329e095a4e503d819dfc646b6e6cda3f194e43 /src/network | |
| parent | c4cf90b1f739c47383672de3d66b1d9d5427f5db (diff) | |
network: add a QT_CONFIG(bearermanagement) guard
for QNetworkReplyHttpImplPrivate::startWaitForSession().
This amends 8a39384e907e830c907f73009f498c486b22bd20.
Task-number: QTBUG-63847
Change-Id: Ic20a4ac3ab97ed25010e0679810ef64c3ff42c05
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 89d552f431..fa49c8e05b 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1828,6 +1828,7 @@ bool QNetworkReplyHttpImplPrivate::start(const QNetworkRequest &newHttpRequest) #endif } +#if QT_CONFIG(bearermanagement) bool QNetworkReplyHttpImplPrivate::startWaitForSession(QSharedPointer<QNetworkSession> &session) { Q_Q(QNetworkReplyHttpImpl); @@ -1853,6 +1854,7 @@ bool QNetworkReplyHttpImplPrivate::startWaitForSession(QSharedPointer<QNetworkSe QMetaObject::invokeMethod(q, "_q_finished", connection); return false; } +#endif // QT_CONFIG(bearermanagement) void QNetworkReplyHttpImplPrivate::_q_startOperation() { diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 1b702bd2ec..1eedfa5a5d 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -160,7 +160,9 @@ signals: class QNetworkReplyHttpImplPrivate: public QNetworkReplyPrivate { +#if QT_CONFIG(bearermanagement) bool startWaitForSession(QSharedPointer<QNetworkSession> &session); +#endif public: |