diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-17 23:59:41 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-17 23:59:41 +0000 |
| commit | d33062795cf47553022420ddf3e8748f1b09b64f (patch) | |
| tree | 8c50e791cfa687d9eaf9a3b05e0f28b5f05bdaf0 | |
| parent | 3f56e8191f546ac88938363fbe63b1811bf5651f (diff) | |
| parent | 2da8d9b0acf174716cc1349d34e95fa91b0b0365 (diff) | |
| download | gtk+-d33062795cf47553022420ddf3e8748f1b09b64f.tar.gz | |
Merge branch 'ebassi/docs-for-master' into 'master'
Ebassi/docs for master
See merge request GNOME/gtk!2971
| -rw-r--r-- | docs/reference/gtk/gtk4.types.in | 11 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in index 9bc79517f7..a3e57c5be4 100644 --- a/docs/reference/gtk/gtk4.types.in +++ b/docs/reference/gtk/gtk4.types.in @@ -19,8 +19,8 @@ gtk_assistant_page_get_type gtk_at_context_get_type gtk_bin_layout_get_type gtk_bitset_get_type -gtk_expression_get_type gtk_bookmark_list_get_type +gtk_bool_filter_get_type gtk_box_get_type gtk_box_layout_get_type gtk_buildable_get_type @@ -46,6 +46,7 @@ gtk_cell_renderer_spinner_get_type gtk_cell_renderer_text_get_type gtk_cell_renderer_toggle_get_type gtk_cell_view_get_type +gtk_center_box_get_type gtk_center_layout_get_type gtk_check_button_get_type gtk_closure_expression_get_type @@ -65,14 +66,16 @@ gtk_constraint_target_get_type gtk_css_provider_get_type gtk_custom_filter_get_type gtk_custom_sorter_get_type +gtk_custom_layout_get_type gtk_dialog_get_type gtk_directory_list_get_type gtk_drag_icon_get_type gtk_drag_source_get_type gtk_drawing_area_get_type -gtk_drop_target_get_type -gtk_drop_target_async_get_type +gtk_drop_controller_motion_get_type gtk_drop_down_get_type +gtk_drop_target_async_get_type +gtk_drop_target_get_type gtk_editable_get_type gtk_editable_label_get_type gtk_emoji_chooser_get_type @@ -87,6 +90,7 @@ gtk_event_controller_motion_get_type gtk_event_controller_scroll_get_type gtk_every_filter_get_type gtk_expander_get_type +gtk_expression_get_type gtk_file_chooser_dialog_get_type gtk_file_chooser_get_type gtk_file_chooser_native_get_type @@ -250,6 +254,7 @@ gtk_video_get_type gtk_viewport_get_type gtk_volume_button_get_type gtk_widget_get_type +gtk_widget_paintable_get_type gtk_window_get_type gtk_window_controls_get_type gtk_window_group_get_type diff --git a/meson.build b/meson.build index c86d5ce5c2..476072d0da 100644 --- a/meson.build +++ b/meson.build @@ -373,7 +373,8 @@ endif pangocairo_dep = dependency('pangocairo', version: pango_req, fallback : ['pango', 'libpangocairo_dep']) pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, - fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) + fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'], + default_options: ['man=false']) epoxy_dep = dependency('epoxy', version: epoxy_req, fallback: ['libepoxy', 'libepoxy_dep']) harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false, |