Merge "Merge remote-tracking branch 'origin/5.13' into dev"

b74071e6 · Qt Forward Merge Bot · 874f8ef3 · 904aa66f · b74071e6 · b74071e6
Commit b74071e6 authored 5 years ago by Qt Forward Merge Bot
--- a/src/controls/doc/qtquickcontrols1.qdocconf
+++ b/src/controls/doc/qtquickcontrols1.qdocconf
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)

 project                 = QtQuickControls1
 description             = Qt Quick Controls 1 Reference Documentation

--- a/src/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/dialogs/doc/qtquickdialogs.qdocconf
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)

 project                 = QtQuickDialogs
 description             = Qt Quick Dialogs Reference Documentation

--- a/src/extras/doc/qtquickextras.qdocconf
+++ b/src/extras/doc/qtquickextras.qdocconf
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)

 project = QtQuickExtras
 description = Qt Quick Extras Reference Documentation