diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc')
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc index 306fc40cb8..1dfd031633 100644 --- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -812,7 +812,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td><b> - <a href="http://doc.qt.digia.com/4.0/qftp.html">QFtp</a> + <a href="http://doc.qt.io/archives/qt-4.7/qftp.html">QFtp</a> </b></td> <td> Implementation of the FTP protocol @@ -885,7 +885,7 @@ <pre>#include <Qt></pre> <ul> <li> - <a href="http://doc.qt.digia.com/4.0/qt-qt3.html"> + <a href="http://doc.qt.io/archives/qt-4.7/qt-qt3.html"> Qt 3 support members</a></li> </ul> @@ -893,7 +893,7 @@ <h3>Types</h3> <ul> <li>flags - <a href="http://doc.qt.digia.com/4.0/qt.html#AlignmentFlag-enum">Alignment</a></b></li> + <a href="http://doc.qt.io/archives/qt-4.7/qt.html#AlignmentFlag-enum">Alignment</a></b></li> <li>...</li></ul> <hr /> \endraw |