diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
| commit | dd333172e2ade1db6d0af72b4ed44262c2b4d8c7 (patch) | |
| tree | 16301a9b938826cf4b78b751907378d96423c5d0 /src/quick/doc | |
| parent | 3d266d90cb920375bb856844baea290e52355aad (diff) | |
| parent | ffeaac704efc9eb85464d0a401d98e28991ec4d3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I800f39ea59efd6049d3226ec27b8ecb3f6e9ae28
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc index 30aca38678..f27f87e743 100644 --- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc +++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc @@ -420,7 +420,7 @@ on the display resolution on offer. \section2 Related Information \list - \li \l{Qt Quick Controls2 - Gallery Example}{Gallery example} + \li \l{Qt Quick Controls 2 - Gallery Example}{Gallery example} \li \l{Qt Quick Controls 2 - Text Editor}{Text Editor example} \li \l{Font Awesome} \li \l{Scalability} diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 4d8da5ed5a..4b843f366b 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -118,7 +118,7 @@ Additional Qt Quick information: \li \l{Qt Quick Test QML Types}{Tests} - contains types for writing unit test for a QML application \endlist \li \l{Qt Quick Examples and Tutorials} -\li \l{Qt Quick Guidelines} +\li \l{Best Practices for QML and Qt Quick}{Qt Quick Guidelines} \endlist Further information for writing QML applications: |