diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-05 17:08:54 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-06 09:40:03 +0100 |
| commit | 276320caac4f0fd6399974a15a636a92ea6a7cfa (patch) | |
| tree | d21021ab250f8bcae91772def12b6a0c79fcc98b /doc/config | |
| parent | 4cf407252c23717269003f2ec8a9af3204cb30da (diff) | |
make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.
Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/qtcreator-developer.qdocconf | 1 | ||||
| -rw-r--r-- | doc/config/qtcreator-project.qdocconf | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/doc/config/qtcreator-developer.qdocconf b/doc/config/qtcreator-developer.qdocconf index 4e5637abff..a2c8a101e0 100644 --- a/doc/config/qtcreator-developer.qdocconf +++ b/doc/config/qtcreator-developer.qdocconf @@ -46,7 +46,6 @@ outputdir = $OUTDIR exampledirs = $SRCDIR/api/examples indexes = qt.index -include(compat.qdocconf) include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) include(qt-defines.qdocconf) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index e0eb7ce797..dd1792f278 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -9,7 +9,6 @@ exampledirs = $SRCDIR/examples \ $SRCDIR/snippets indexes = qt.index -include(compat.qdocconf) include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) include(qt-defines.qdocconf) |