diff options
| author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-02-27 14:11:09 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 20:41:44 (GMT) |
| commit | abf19060e20b00b56812a726b1e8fa9d4c6cfd48 (patch) | |
| tree | 89d504924458145ef484dd39a2d1e34eeb61ae98 /src | |
| parent | 83a88fb33c52cbebf493e204e053b6316044e7cc (diff) | |
| download | Qt-abf19060e20b00b56812a726b1e8fa9d4c6cfd48.zip Qt-abf19060e20b00b56812a726b1e8fa9d4c6cfd48.tar.gz Qt-abf19060e20b00b56812a726b1e8fa9d4c6cfd48.tar.bz2 | |
QNetwork: fix compilation with "-no-feature-bearermanagement"
Task-number: QTBUG-23239
Change-Id: I12f89a4e595231738985ca0cf3179fee7de9fa72
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo_p.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index 68451f9..14963d0 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -521,7 +521,7 @@ void QNetworkAccessHttpBackend::postRequest() // Create the HTTP thread delegate QHttpThreadDelegate *delegate = new QHttpThreadDelegate; -#ifndef Q_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT QVariant v(property("_q_networksession")); if (v.isValid()) delegate->networkSession = qvariant_cast<QSharedPointer<QNetworkSession> >(v); diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 50a6129..f3a57ec 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -287,12 +287,14 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor #endif #ifndef Q_OS_SYMBIAN +#ifndef QT_NO_BEARERMANAGEMENT // This function has a special implementation for symbian right now in qhostinfo_symbian.cpp but not on other OS. QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>) { return QHostInfoAgent::fromName(hostName); } #endif +#endif /*! diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 13208ed..bac9b96 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -101,7 +101,9 @@ class QHostInfoAgent : public QObject Q_OBJECT public: static QHostInfo fromName(const QString &hostName); +#ifndef QT_NO_BEARERMANAGEMENT static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession); +#endif #ifdef Q_OS_SYMBIAN static int lookupHost(const QString &name, QObject *receiver, const char *member); |