diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:34 +0200 |
| commit | 904aa66f6fadb908c311e7975780212cb6aff2e9 (patch) | |
| tree | 83f701151e8cba608cada4fad91df80d3ff944a2 | |
| parent | 874f8ef3b9fb9d80a2b05c264ca48464e31257e2 (diff) | |
| parent | 845cd17a498d6008992b04ec4ca1984e6e73de3c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I69f231e99be0cc9a5600d95d1f53f70f5d55593e
| -rw-r--r-- | src/controls/doc/qtquickcontrols1.qdocconf | 1 | ||||
| -rw-r--r-- | src/dialogs/doc/qtquickdialogs.qdocconf | 1 | ||||
| -rw-r--r-- | src/extras/doc/qtquickextras.qdocconf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/doc/qtquickcontrols1.qdocconf b/src/controls/doc/qtquickcontrols1.qdocconf index d2ea0c475..1a795dd11 100644 --- a/src/controls/doc/qtquickcontrols1.qdocconf +++ b/src/controls/doc/qtquickcontrols1.qdocconf @@ -1,4 +1,5 @@ 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 diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf index c617e27d2..51c2dd33a 100644 --- a/src/dialogs/doc/qtquickdialogs.qdocconf +++ b/src/dialogs/doc/qtquickdialogs.qdocconf @@ -1,4 +1,5 @@ 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 diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf index d7a56c82e..7a82854c3 100644 --- a/src/extras/doc/qtquickextras.qdocconf +++ b/src/extras/doc/qtquickextras.qdocconf @@ -1,4 +1,5 @@ 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 |