diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:24 +0200 |
| commit | 7050dd2930724145e2cc547bfc1281bca04e6edc (patch) | |
| tree | bfd9ec78bc41b931ec3b792fa955714b5f380ff5 /src/assistant | |
| parent | 6ed8a22dd2756557954dc85052870c0894de06ba (diff) | |
| parent | 710a54b0fe1e109b2c1c504b89f4f25b9c6d18e7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I51fa8c90923e9730d7787e763fad996db51d350e
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/assistant/doc/qtassistant.qdocconf | 1 | ||||
| -rw-r--r-- | src/assistant/help/doc/qthelp.qdocconf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf index d6c714a6d..07e93da5f 100644 --- a/src/assistant/assistant/doc/qtassistant.qdocconf +++ b/src/assistant/assistant/doc/qtassistant.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qttools.qdocconf) project = QtAssistant description = Qt Assistant Manual diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf index 05f34e9f3..7bde6302d 100644 --- a/src/assistant/help/doc/qthelp.qdocconf +++ b/src/assistant/help/doc/qthelp.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qttools.qdocconf) project = QtHelp description = Qt Help Reference Documentation |