diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:08:53 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-20 12:08:27 +0200 |
| commit | 5931caca23709ed0b2583ca2fd268191d06a23ef (patch) | |
| tree | 2519bd7dbce469e1ce185faaeb6bef481cade227 /src/qml/doc/src/qtqml.qdoc | |
| parent | 7da45b21b76965e021e8a049715b1dee34081f7c (diff) | |
| parent | 2556b97ab22cfde606d2b77d6e816fd282741291 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
Diffstat (limited to 'src/qml/doc/src/qtqml.qdoc')
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 61ebbcf690..64d6bb9ac4 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -148,6 +148,7 @@ Further information for writing QML applications: \list \li \l{Qt QML C++ Classes}{C++ Classes} \li \l{Qt QML QML Types}{QML Types} +\li \l{Qt QML Examples}{Examples} \endlist */ |