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-contextcmds.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-contextcmds.qdoc')
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc index 12eef508a8..98321f9a39 100644 --- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -428,7 +428,7 @@ \quotation \raw HTML <h3> - <a href="http://qt-project.org/doc/qt-5.0/qtcore/qchar.html#Joining-enum">Joining</a> + <a href="http://doc.qt.io/qt-5/qchar.html#JoiningType-enum">Joining</a> QChar::joining () const</h3> \endraw @@ -787,7 +787,7 @@ \quotation \raw HTML - <h3><a href="http://qt-project.org/doc/qt-5.0/qtwidgets/qaction.html">QAction</a> + <h3><a href="http://doc.qt.io/qt-5/qaction.html">QAction</a> * QMenu::addAction ( const QIcon & <i>icon</i>, const QString & <i>text</i> ) </h3> |