diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:30 +0200 |
| commit | 12e41a09bd6eeb613e1f773de70baaad20b88cc3 (patch) | |
| tree | 72e93caec205af26323975ab2c2d737977a6c9a8 /src | |
| parent | 38151c0581a5e248044df1a7bff1e23122b1e76f (diff) | |
| parent | 72cc53b5ee8bd6821d0094ad0c5c45d7a269f943 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Ie270aa64bdac3339bfbb5974e526d50e66e001fd
Diffstat (limited to 'src')
| -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 */ |