diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 11:23:46 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-25 11:23:46 +0000 |
commit | 2cac171ddedfecdfc6fa27c5326f9eebfab1822e (patch) | |
tree | ff8e7c162875d7374ddc42224a91533b7e8c8663 /src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc | |
parent | 5113fdeb7d50979c6acbe2c9c5b26ad134614873 (diff) | |
parent | 709e40093e6081b18e0d3003e0a088e1a9b6f211 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc index b3f4f29f0b..f341699ee8 100644 --- a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -1479,10 +1479,10 @@ \printuntil hello First we create a \l - {http://qt-project.org/doc/qt-5.0/qtwidgets/qapplication.html} {QApplication} + {http://doc.qt.io/qt-5/qapplication.html} {QApplication} object using the \c argc and \c argv parameters, then we create a \l - {http://qt-project.org/doc/qt-5.0/qtwidgets/qpushbutton.html} {QPushButton}. + {http://doc.qt.io/qt-5/qpushbutton.html} {QPushButton}. \endquotation See also \l {printline-command} {\\printline} and \l @@ -1782,7 +1782,7 @@ \code / *! - Read the \l {http://qt-project.org/doc/qt-5.0/} + Read the \l {http://doc.qt.io/qt-5/} {Qt 5.0 Documentation} carefully. * / \endcode @@ -1790,7 +1790,7 @@ QDoc renders this as: \quotation - Read the \l {http://qt-project.org/doc/qt-5.0/} + Read the \l {http://doc.qt.io/qt-5/} {Qt 5.0 Documentation} carefully. \endquotation @@ -2419,7 +2419,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html"> + <a href="http://doc.qt.io/qt-5/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2428,7 +2428,7 @@ <tr valign="top" bgcolor="#c0c0c0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html"> + <a href="http://doc.qt.io/qt-5/layout.html"> Layout Management</a></td> <td>The Qt layout system provides a simple and powerful way of specifying the layout @@ -2437,7 +2437,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html"> + <a href="http://doc.qt.io/qt-5/dnd.html"> Drag and Drop</a></td> <td>Drag and drop provides a simple visual mechanism which users can use to transfer @@ -2538,7 +2538,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html"> + <a href="http://doc.qt.io/qt-5/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2600,7 +2600,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html"> + <a href="http://doc.qt.io/qt-5/signalsandslots.html"> Signals and Slots</a> </td> <td>Signals and slots are used for communication @@ -2609,7 +2609,7 @@ <tr valign="top" bgcolor="#c0c0c0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html"> + <a href="http://doc.qt.io/qt-5/layout.html"> Layout Management</a></td> <td>The Qt layout system provides a simple and powerful way of specifying the layout @@ -2618,7 +2618,7 @@ <tr valign="top" bgcolor="#d0d0d0"> <td> - <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html"> + <a href="http://doc.qt.io/qt-5/dnd.html"> Drag and Drop</a></td> <td>Drag and drop provides a simple visual mechanism which users can use to transfer @@ -3036,7 +3036,7 @@ \quotation \raw HTML <h3>geometry : - <a href="http://qt-project.org/doc/qt-5.0/qtcore/qrect.html">QRect</a> + <a href="http://doc.qt.io/qt-5/qrect.html">QRect</a> </h3> \endraw |