summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2019-12-03 12:48:37 +0000
committerPhilip Withnall <philip@tecnocode.co.uk>2019-12-03 12:48:37 +0000
commitb698327b99255706a3e8de37a5fbc1ce80e3f29f (patch)
treec30f01b316ac758488591d27b76a42091c7fe9a8
parenta721761e5af2c0682fbd070667d4c6f6ea13711c (diff)
parent7b65b77a65ab07a56ebbbf91e931a177fc82291e (diff)
downloadglib-b698327b99255706a3e8de37a5fbc1ce80e3f29f.tar.gz
Merge branch 'cherry-pick-6ea0dcc6' into 'master'
doc: Add missing --ignore-decorators Closes #1953 See merge request GNOME/glib!1260
-rw-r--r--docs/reference/meson.build17
1 files changed, 16 insertions, 1 deletions
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 4e2553a0f..35e5ce526 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -19,9 +19,24 @@ ignore_decorators = [
foreach version : stable_2_series_versions
ignore_decorators += [
+ # Note that gtkdoc is going to use those in regex, and the longest match
+ # must come first. That's why '_FOR()' variant comes first.
+ # gtkdoc special-case '()' and replace it by a regex matching a symbol name.
'GLIB_AVAILABLE_IN_2_' + version,
+ 'GLIB_DEPRECATED_IN_2_' + version + '_FOR()',
'GLIB_DEPRECATED_IN_2_' + version,
- 'GLIB_DEPRECATED_IN_2_' + version + '_FOR',
+
+ 'GLIB_AVAILABLE_ENUMERATOR_IN_2_' + version,
+ 'GLIB_DEPRECATED_ENUMERATOR_IN_2_' + version + '_FOR()',
+ 'GLIB_DEPRECATED_ENUMERATOR_IN_2_' + version,
+
+ 'GLIB_AVAILABLE_MACRO_IN_2_' + version,
+ 'GLIB_DEPRECATED_MACRO_IN_2_' + version + '_FOR()',
+ 'GLIB_DEPRECATED_MACRO_IN_2_' + version,
+
+ 'GLIB_AVAILABLE_TYPE_IN_2_' + version,
+ 'GLIB_DEPRECATED_TYPE_IN_2_' + version + '_FOR()',
+ 'GLIB_DEPRECATED_TYPE_IN_2_' + version,
]
endforeach