diff options
author | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
commit | 7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch) | |
tree | e60229477bc8269cf14904620bf0fc5ad18ef6d0 /src/gui/embedded/qtransportauth_qws.cpp | |
parent | f8c9314d6224948c28487e291b4cdad0049682c7 (diff) | |
parent | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff) | |
download | Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/embedded/qtransportauth_qws.cpp')
-rw-r--r-- | src/gui/embedded/qtransportauth_qws.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/embedded/qtransportauth_qws.cpp b/src/gui/embedded/qtransportauth_qws.cpp index 9a50702..90e90d1 100644 --- a/src/gui/embedded/qtransportauth_qws.cpp +++ b/src/gui/embedded/qtransportauth_qws.cpp @@ -445,7 +445,7 @@ QIODevice *QTransportAuth::passThroughByClient( QWSClient *client ) const /*! \internal Return a QIODevice pointer (to an internal QBuffer) which can be used - to receive data after authorisation on transport \a d. + to receive data after authorization on transport \a d. The return QIODevice will act as a pass-through. @@ -468,7 +468,7 @@ QAuthDevice *QTransportAuth::recvBuf( QTransportAuth::Data *data, QIODevice *iod /*! Return a QIODevice pointer (to an internal QBuffer) which can be used - to write data onto, for authorisation on transport \a d. + to write data onto, for authorization on transport \a d. The return QIODevice will act as a pass-through. |