diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-22 08:30:27 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-25 15:11:52 +0100 |
| commit | 77b1c2d2e9497501473fa1992ce6bac9b036698e (patch) | |
| tree | 2e6fe3436689b77f85d2657e7d7512ee36ddc47d /doc/config | |
| parent | fed4549db56f20f2e3521bc51495f372e7efb7a3 (diff) | |
Doc: cleanup Qt4 compatibility file
Use Qt4 compatibility macros and aliases only in the Qt4
version of the docs. Rename compat.qdocconf to compat-qt4.qdocconf to
indicate that this is for Qt4 compatibility only.
This fixes a bunch of warnings when generating the documentation with
Qt5.
Change-Id: If051a0c6b01304c872c501d5eff558641c459d1a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/compat-qt4.qdocconf (renamed from doc/config/compat.qdocconf) | 11 | ||||
| -rw-r--r-- | doc/config/qbs-project.qdocconf | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/doc/config/compat.qdocconf b/doc/config/compat-qt4.qdocconf index 5745ed93b..caf7bb241 100644 --- a/doc/config/compat.qdocconf +++ b/doc/config/compat-qt4.qdocconf @@ -1,6 +1,6 @@ -alias.i = e -alias.include = input - +macro.li = "\\o" +alias.i = e +alias.include = input macro.0 = "\\\\0" macro.b = "\\\\b" macro.n = "\\\\n" @@ -26,6 +26,5 @@ macro.i91 = "\\o{9,1}" macro.img = "\\image" macro.endquote = "\\endquotation" macro.relatesto = "\\relates" - -spurious = "Missing comma in .*" \ - "Missing pattern .*" +spurious = "Missing comma in .*" \ + "Missing pattern .*" diff --git a/doc/config/qbs-project.qdocconf b/doc/config/qbs-project.qdocconf index d1a6f09d3..c8d89b817 100644 --- a/doc/config/qbs-project.qdocconf +++ b/doc/config/qbs-project.qdocconf @@ -7,7 +7,6 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images outputdir = $OUTDIR exampledirs = $SRCDIR -include(compat.qdocconf) include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) @@ -32,7 +31,3 @@ qhp.Qbs.subprojects.manual.type = manual # Doxygen compatibility commands macro.see = "\\sa" macro.function = "\\fn" - -# Qt4 compatibility macros -macro.li = "\\o" - |