summaryrefslogtreecommitdiff
path: root/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdoc/doc/qdoc-manual-topiccmds.qdoc')
-rw-r--r--src/qdoc/doc/qdoc-manual-topiccmds.qdoc35
1 files changed, 13 insertions, 22 deletions
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 5c3de3a98..63a500ae1 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -28,7 +28,6 @@
/*!
\page 13-qdoc-commands-topics.html
\previouspage Command Index
- \contentspage QDoc Manual
\nextpage Context Commands
\title Topic Commands
@@ -812,21 +811,13 @@
<table width="100%">
<tr valign="top" bgcolor="#d0d0d0">
<td><b>
- <a href="http://doc.qt.io/qt-5/qabstractsocket.html">QAbstractSocket</a>
+ <a href="https://doc.qt.io/qt-5/qabstractsocket.html">QAbstractSocket</a>
</b></td>
<td>
The base functionality common to all socket types
</td></tr>
<tr valign="top" bgcolor="#d0d0d0">
- <td><b>
- <a href="http://doc.qt.io/archives/qt-4.7/qftp.html">QFtp</a>
- </b></td>
- <td>
- Implementation of the FTP protocol
- </td></tr>
-
- <tr valign="top" bgcolor="#d0d0d0">
<td>...</td>
<td>...</td>
</tr>
@@ -884,7 +875,7 @@
\quotation
\raw HTML
- <center><h1>Qt Namespace Reference</h1></center>
+ <center><h1>Qt Namespace</h1></center>
<p>The Qt namespace contains miscellaneous
identifiers used throughout the Qt library.
<a href="13-qdoc-commands-topics.html#name">More...</a>
@@ -893,15 +884,15 @@
<pre>#include &lt;Qt&gt;</pre>
<ul>
<li>
- <a href="http://doc.qt.io/archives/qt-4.7/qt-qt3.html">
- Qt 3 support members</a></li>
+ <a href="https://doc.qt.io/qt-5/qt-obsolete.html">
+ Obsolete members</a></li>
</ul>
<h3>Types</h3>
<ul>
<li>flags
- <a href="http://doc.qt.io/archives/qt-4.7/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
+ <a href="https://doc.qt.io/qt-5/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
<li>...</li></ul>
<hr />
\endraw
@@ -1206,7 +1197,7 @@
\endcode
This example generates the
- \l {http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
+ \l {https://doc.qt.io/qt-5/qml-qtquick-transform.html} {QML Transform}
page. The \\qmlclass comment should include the \l
{since-command} {\\since} command, because all QML types are
new. It should also include the \l{brief-command} {\\brief}
@@ -1279,7 +1270,7 @@
\endcode
The example generates the \l
- {http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
+ {https://doc.qt.io/qt-5/qml-qtquick-transform.html} {QML Transform}
page. The \e{\\qmltype} comment includes \l{instantiates-command}
{\\instantiates} to specify that a Transform is instantiated by
the C++ class QGraphicsTransform. A \\qmltype comment should
@@ -1412,7 +1403,7 @@
\endcode
The example generates the \l
- {http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
+ {https://doc.qt.io/qt-5/qml-qtquick-transform.html} {QML Transform}
page. The \e{\\qmltype} comment includes \l{instantiates-command}
{\\instantiates} to specify that a Transform is instantiated by
the C++ class QGraphicsTransform. A \\qmltype comment should
@@ -1489,20 +1480,20 @@
\code
/ *!
- \typedef QLinkedList::Iterator
+ \typedef QVector::Iterator
- Qt-style synonym for QList::iterator.
+ Qt-style synonym for QVector::iterator.
* /
\endcode
- QDoc includes this one on the reference page for class QLinkedList as:
+ QDoc includes this one on the reference page for class QVector as:
\quotation
\raw HTML
- <h3>typedef QLinkedList::Iterator</h3>
+ <h3>typedef QVector::Iterator</h3>
\endraw
- Qt-style synonym for QList::iterator.
+ Qt-style synonym for QVector::iterator.
\endquotation
\target variable-command