diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-06-11 15:43:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-12 10:58:06 +0200 |
| commit | fb8839690418d3af30536b297b58db94517f2b17 (patch) | |
| tree | 02034f45e73efbce4472f3f17a84362ffdfee81d /doc/src/legal | |
| parent | cd4b41575da72b2f55ba51e79b7b4d08c2bf9269 (diff) | |
| download | qtdoc-fb8839690418d3af30536b297b58db94517f2b17.tar.gz | |
Doc: Do not parse snippets as documentation sourcev5.1.0-rc1
The .qdocconf file was using the root of the repository as a source
directory, leading to also the snippets being parsed as source for
docs.
This change modifies .qdocconf to remove the unnecessary paths and
excludes src/snippets. It also fixes the \snippet links to be
relative to src/ instead of the root folder.
Change-Id: Ifd03d7f5f28360bbe89b250fc4567a81ab3a008d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'doc/src/legal')
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/legal/gpl.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/legal/licenses-fonts.qdoc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index 85e8ddb2..5173ea7f 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -130,7 +130,7 @@ Note that this license is compatible with the FreeType license. - \quotefile doc/src/snippets/legal/CatharonLicense.txt + \quotefile snippets/legal/CatharonLicense.txt \section1 HarfBuzz (\c harfbuzz) diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/gpl.qdoc index cb38b432..bca9514a 100644 --- a/doc/src/legal/gpl.qdoc +++ b/doc/src/legal/gpl.qdoc @@ -36,7 +36,7 @@ Reference: \l{GNU General Public License} - \snippet doc/src/snippets/code/doc_src_gpl.qdoc GPL v3 + \snippet snippets/code/doc_src_gpl.qdoc GPL v3 */ /*! \page lgpl.html @@ -50,7 +50,7 @@ Reference: \l{GNU Lesser General Public License, version 2.1} - \snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1 + \snippet snippets/code/doc_src_lgpl.qdoc LGPL v2.1 \section1 Digia Qt LGPL Exception version 1.1 diff --git a/doc/src/legal/licenses-fonts.qdoc b/doc/src/legal/licenses-fonts.qdoc index 8e62471d..4aa57a61 100644 --- a/doc/src/legal/licenses-fonts.qdoc +++ b/doc/src/legal/licenses-fonts.qdoc @@ -81,7 +81,7 @@ \section1 Babelfish - \snippet doc/src/snippets/code/doc_src_licenses.qdoc 1 + \snippet snippets/code/doc_src_licenses.qdoc 1 \section1 Bigelow & Holmes Luxi @@ -212,7 +212,7 @@ Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below) - \snippet doc/src/snippets/code/doc_src_licenses.qdoc 2 + \snippet snippets/code/doc_src_licenses.qdoc 2 \section1 Fixed Fonts |