diff options
| author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-13 20:05:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 11:29:04 +0100 |
| commit | 5b1aa4c75de4301d1417fd98bb1abf0767779736 (patch) | |
| tree | 44d3bab26ec70c633abb20b58bb18f9d5bf54edb /src/network/kernel | |
| parent | 23a372ab8d59cd9b33356a16744313890b544f4f (diff) | |
Fixed build break when bearer is disabled.
Change-Id: I29e88b046f6502c84acc9c6f566ecc328cf24e38
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 1361799a4d..45073f6ad1 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -248,10 +248,12 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor } #endif +#ifndef QT_NO_BEARERMANAGEMENT QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>) { return QHostInfoAgent::fromName(hostName); } +#endif /*! diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index deb76c0ee9..35de89c1e9 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -95,7 +95,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 }; class QHostInfoPrivate |