Merge branch 'ignore-more-decorators' into 'master'

docs: Ignore more version macros

See merge request GNOME/glib!630
This commit is contained in:
Philip Withnall 2019-02-01 09:41:50 +00:00
commit 66f3016026
3 changed files with 18 additions and 0 deletions

View File

@ -138,6 +138,8 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_52',
'GLIB_AVAILABLE_IN_2_54',
'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60',
'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28',
@ -170,6 +172,10 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_54_FOR',
'GLIB_DEPRECATED_IN_2_56',
'GLIB_DEPRECATED_IN_2_56_FOR',
'GLIB_DEPRECATED_IN_2_58',
'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR',
]
# FIXME: More win32 headers were added to fix building gio-scan

View File

@ -61,6 +61,8 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_52',
'GLIB_AVAILABLE_IN_2_54',
'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60',
'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28',
@ -93,6 +95,10 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_54_FOR',
'GLIB_DEPRECATED_IN_2_56',
'GLIB_DEPRECATED_IN_2_56_FOR',
'GLIB_DEPRECATED_IN_2_58',
'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR',
]
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')

View File

@ -30,6 +30,8 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_52',
'GLIB_AVAILABLE_IN_2_54',
'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60',
'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28',
@ -62,6 +64,10 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_54_FOR',
'GLIB_DEPRECATED_IN_2_56',
'GLIB_DEPRECATED_IN_2_56_FOR',
'GLIB_DEPRECATED_IN_2_58',
'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR',
]
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')