diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
| commit | 22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch) | |
| tree | f84ff6878248c791319fc6be1f1956f2177b5bdb /doc/src/porting/qt4-network.qdoc | |
| parent | fa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff) | |
| parent | a14b8805945c5e00be26092406a468fd8b8acc14 (diff) | |
| download | Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/porting/qt4-network.qdoc')
| -rw-r--r-- | doc/src/porting/qt4-network.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/porting/qt4-network.qdoc b/doc/src/porting/qt4-network.qdoc index 91c1c4e..60e6dbb 100644 --- a/doc/src/porting/qt4-network.qdoc +++ b/doc/src/porting/qt4-network.qdoc @@ -199,7 +199,7 @@ level QNetworkProtocol and QUrlOperator abstraction has been eliminated. These classes attempted the impossible (unify FTP and HTTP under one roof), and unsurprisingly failed at that. Qt 4 - still provides QFtp, and it also proveds the QNetworkAccessManager. + still provides QFtp, and it also provides the QNetworkAccessManager. The QSocket class in Qt 3 has been renamed QTcpSocket. The new class is reentrant and supports blocking. It's also easier to |