summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-02-05 07:46:37 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-02-12 09:06:14 +0100
commitcd352d921fc2f523f8d83d387d51390305e71d89 (patch)
tree36379e318a25e71edbd10290f32cc57cd1366b33
parenta3d82bec9678fda3d8c8b7766e83267142d1ef4a (diff)
downloadqttools-cd352d921fc2f523f8d83d387d51390305e71d89.tar.gz
Doc: Remove references to 4.x in QDoc manual
Fixes: QTBUG-48218 Change-Id: Iedbb20225d41cfd3213b8b7a1737da41b4e64561 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-rw-r--r--src/qdoc/doc/qdoc-manual-contextcmds.qdoc10
-rw-r--r--src/qdoc/doc/qdoc-manual-qdocconf.qdoc8
-rw-r--r--src/qdoc/doc/qdoc-manual-topiccmds.qdoc24
3 files changed, 17 insertions, 25 deletions
diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
index 2c42493e8..d3cf23b76 100644
--- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
@@ -672,11 +672,11 @@
\endcode
QDoc includes this line on the reference page for the
- \l{http://qt-project.org/doc/qt-4.7/qml-pauseanimation.html} {PauseAnimation}
+ \l [QML] PauseAnimation
element:
\quotation
- Inherits \l{http://qt-project.org/doc/qt-4.7/qml-animation.html} {Animation}
+ Inherits \l [QML] Animation
\endquotation
\target overload-command
@@ -693,9 +693,9 @@
should be fully documented. Each overload can have whatever extra
documentation you want to add for just that overloaded version.
- From Qt 4.5, you can include the function name plus '()' as a
- parameter to the \b{\\overload} command, which will include a
- standard \e{This function overloads...} line of text with a link
+ You can include the function name plus '()' as a parameter to
+ the \b{\\overload} command, which will include a standard
+ \e{This function overloads...} line of text with a link
to the documentation for the primary version of the function.
\code
diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
index 91f08cbd3..415702e98 100644
--- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -1221,7 +1221,7 @@
QT_VERSION_STR is defined in qglobal.h as follows
\badcode
- #define QT_VERSION_STR "4.0.1"
+ #define QT_VERSION_STR "5.14.1"
\endcode
When a version number is specified (using the \tt{\l version} or
@@ -1726,14 +1726,14 @@
\badcode
project = Qt
description = Qt Reference Documentation
- url = http://doc.qt.io/qt-4.8/
+ url = https://doc.qt.io/qt/
...
\endcode
This makes sure that whenever \c qt.index is used to generate
references to for example Qt classes, the base URL is \c
- http://doc.qt.io/qt-4.8/.
+ https://doc.qt.io/qt/.
See also \l indexes and \l {url.examples}.
@@ -1801,7 +1801,7 @@
\badcode
project = Qt
description = Qt Reference Documentation
- url = http://doc.qt.io/qt-4.8/
+ url = http://doc.qt.io/qt/
...
\endcode
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 5c3de3a98..cdd0c9aeb 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -812,21 +812,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 +876,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 +885,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 +1198,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 +1271,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 +1404,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