diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:01:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 15:56:39 +0200 |
| commit | d389fe039203f318a8c9a836dea4c348a1a892a8 (patch) | |
| tree | 223f8c3c6869818c43a139040bcd3862f0393095 /src/qml/doc | |
| parent | de0d91abbbcf58a66018a08ca77bb4d63a5efda1 (diff) | |
| parent | 47ad6c57d1873c3da362cfad7cc81dc0aa2720a4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmltypeloader.cpp
src/quick/scenegraph/qsgopengldistancefieldglyphcache.cpp
Change-Id: I1a226d8738db2ec06e3cef240a0e040e7c144cad
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index ba4155c08b..cb9fb575b2 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf) project = QtQml description = Qt QML Reference Documentation |