diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:05 +0200 |
| commit | f3daa8bb97bbfc7a309c2bf59de1e41d279e05d1 (patch) | |
| tree | 5d0c805090f2ab3d0e42b5cda21f9383dbdd883d /src/qml/doc | |
| parent | de2f5d2bc11a71fe12fcc4c08fff9bf59571db36 (diff) | |
| parent | e48a10d40001c6efdb3b875c1d0087674dee2a48 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ieaf0811cf045af1e6df4db4ab67d7c38ba0d1fbf
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index d26288ee6e..68c5ab4664 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -69,6 +69,10 @@ \title Qt Creator Manual */ /*! + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#creating-resource-files + \title Creating Resource Files +*/ +/*! \externalpage https://fontawesome.com/ \title Font Awesome */ |