diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-02-23 17:56:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-04 15:12:00 +0000 |
| commit | 841fcfc0a401ac72291c377377a76ebde8039760 (patch) | |
| tree | c60e3f26cc4de5485c1f148e8234950320f262e1 | |
| parent | 54e461222cbde41468a34851e5a181ab38f1eb1a (diff) | |
QDoc: update manual to use links to Qt6 documentation
QDoc command index was still using the links to Qt 5 docs in the
examples. This patch updates them to use Qt 6 docs.
Change-Id: Ie422354090dad72263ccccac419c5ccc9fb5ca8c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 7a558817d43ccf597fb114d3992b0b5105edd83c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index c0038b64e..4532f7cda 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -1435,10 +1435,10 @@ \printuntil hello First we create a \l - {http://doc.qt.io/qt-5/qapplication.html} {QApplication} + {http://doc.qt.io/qt-6/qapplication.html} {QApplication} object using the \c argc and \c argv parameters, then we create a \l - {http://doc.qt.io/qt-5/qpushbutton.html} {QPushButton}. + {http://doc.qt.io/qt-6/qpushbutton.html} {QPushButton}. \endquotation See also \l {printline-command} {\\printline} and \l @@ -1742,16 +1742,16 @@ \code / *! - Read the \l {http://doc.qt.io/qt-5/} - {Qt 5.0 Documentation} carefully. + Read the \l {http://doc.qt.io/qt-6/} + {Qt 6 Documentation} carefully. * / \endcode QDoc renders this as: \quotation - Read the \l {http://doc.qt.io/qt-5/} - {Qt 5.0 Documentation} carefully. + Read the \l {http://doc.qt.io/qt-6/} + {Qt 6 Documentation} carefully. \endquotation If the link target is equivalent to the link text, the second @@ -2383,7 +2383,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://doc.qt.io/qt-5/signalsandslots.html"> + <a href="http://doc.qt.io/qt-6/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2392,7 +2392,7 @@ <tr valign="top" bgcolor="#c0c0c0"> <td> - <a href="http://doc.qt.io/qt-5/layout.html"> + <a href="http://doc.qt.io/qt-6/layout.html"> Layout Management</a></td> <td>The Qt layout system provides a simple and powerful way of specifying the layout @@ -2401,7 +2401,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://doc.qt.io/qt-5/dnd.html"> + <a href="http://doc.qt.io/qt-6/dnd.html"> Drag and Drop</a></td> <td>Drag and drop provides a simple visual mechanism which users can use to transfer @@ -2502,7 +2502,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://doc.qt.io/qt-5/signalsandslots.html"> + <a href="http://doc.qt.io/qt-6/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2564,7 +2564,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://doc.qt.io/qt-5/signalsandslots.html"> + <a href="http://doc.qt.io/qt-6/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2573,7 +2573,7 @@ <tr valign="top" bgcolor="#c0c0c0"> <td> - <a href="http://doc.qt.io/qt-5/layout.html"> + <a href="http://doc.qt.io/qt-6/layout.html"> Layout Management</a></td> <td>The Qt layout system provides a simple and powerful way of specifying the layout @@ -2582,7 +2582,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://doc.qt.io/qt-5/dnd.html"> + <a href="http://doc.qt.io/qt-6/dnd.html"> Drag and Drop</a></td> <td>Drag and drop provides a simple visual mechanism which users can use to transfer @@ -2989,7 +2989,7 @@ \quotation \raw HTML <h3>geometry : - <a href="http://doc.qt.io/qt-5/qrect.html">QRect</a> + <a href="http://doc.qt.io/qt-6/qrect.html">QRect</a> </h3> \endraw |