diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:01:12 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:01:12 (GMT) |
| commit | 6e189eb28161f2d09e0c71ecd590b7ccfd82321c (patch) | |
| tree | 635377ded015a9252a54b1940051e636d83ab675 /src/network/access/qnetworkreplyimpl_p.h | |
| parent | 3925bab16a88822fcef749cb6ba7c542688c2fae (diff) | |
| download | Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.zip Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.tar.gz Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.tar.bz2 | |
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
This add addition ifdefs around code missed by MR 517.
Diffstat (limited to 'src/network/access/qnetworkreplyimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index fcb3397..bc7e408 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -99,8 +99,10 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_copyReadChannelFinished()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) +#ifndef QT_NO_BEARERMANAGEMENT Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) +#endif }; class QNetworkReplyImplPrivate: public QNetworkReplyPrivate @@ -133,8 +135,10 @@ public: void _q_copyReadChannelFinished(); void _q_bufferOutgoingData(); void _q_bufferOutgoingDataFinished(); +#ifndef QT_NO_BEARERMANAGEMENT void _q_networkSessionConnected(); void _q_networkSessionFailed(); +#endif void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData); @@ -196,6 +200,7 @@ public: Q_DECLARE_PUBLIC(QNetworkReplyImpl) }; +#ifndef QT_NO_BEARERMANAGEMENT class QDisabledNetworkReply : public QNetworkReply { Q_OBJECT @@ -209,6 +214,7 @@ public: protected: qint64 readData(char *, qint64) { return -1; } }; +#endif QT_END_NAMESPACE |