diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
| commit | 03a55630cfccf7f6ed01d865c541e07afb25c96e (patch) | |
| tree | 25b4fe750bccad037068ca043b700db0b2cceef4 /doc/src/porting | |
| parent | 8e309899b8287b67905072927df1e00effc2a13e (diff) | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| download | Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.zip Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.gz Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'doc/src/porting')
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/porting/qt4-network.qdoc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index 25dc792..1b6eeb7 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -3201,8 +3201,8 @@ The \c QShared class has been obsoleted by the more powerful QSharedData and QSharedDataPointer as a means of creating custom - implicitly shared classes. It has been renamed Q3Shared moved to - the Qt3Support library. + implicitly shared classes. It has been renamed Q3Shared and moved + to the Qt3Support library. An easy way of porting to Qt 4 is to include this class into your project and to use it instead of \c QShared: @@ -3226,7 +3226,7 @@ \section1 QSimpleRichText QSimpleRichText has been obsoleted by QTextDocument. It has - bene renamed Q3SimpleRichText and moved to the Qt3Support + been renamed Q3SimpleRichText and moved to the Qt3Support library. Previously, you would do the following with Q3SimpleRichText: 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 |