diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-04 09:28:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-04 10:08:56 +0200 |
| commit | 2044d0a03bafa4597863eb2bf3ecb8fa6731ed57 (patch) | |
| tree | 5f2c0d44742770dfcc1dabf1efd8021b21cfeba4 /src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc | |
| parent | 7b0cb855edcfdeb04e7d0d1c2545958877481ecc (diff) | |
| parent | 717b57a9aae4c6d45cbcf91d390e42af56ab8061 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/qml/qqmltypeloader.cpp
src/qml/qml/qqmltypeloader_p.h
Done-with: Simon Hausmann <simon.hausmann@qt.io>
Task-number: QTBUG-68091
Change-Id: I7c0ab3c9446ac50da07b58f54e24eb4587f7f28c
Diffstat (limited to 'src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc')
| -rw-r--r-- | src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc index e70791d1c9..b22b013684 100644 --- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc +++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc @@ -29,6 +29,7 @@ \page qtquick-bestpractices.html \title Best Practices for QML and Qt Quick \brief Lists best practices for working with QML and Qt Quick +\ingroup best-practices Despite all of the benefits that QML and Qt Quick offer, they can be challenging in certain situations. The following sections elaborate on some of |