[gtk: 4/4] Merge branch 'add-child-clash' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit db4b7e3d11ceb8b07a155f73043dde437b84eb03
Merge: 1b93108d10 e4d4b50d6d
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 26 01:17:08 2020 +0000

    Merge branch 'add-child-clash' into 'master'
    
    Make GtkBuildable vfunc accessor functions private
    
    Closes #3191
    
    See merge request GNOME/gtk!2619

 demos/widget-factory/widget-factory.c  |  8 ++---
 docs/reference/gtk/gtk4-sections.txt   | 11 +------
 docs/reference/gtk/migrating-3to4.md   |  7 ++++
 gtk/gtkbuildable.c                     | 36 ++++++++++-----------
 gtk/gtkbuildable.h                     | 59 +++++-----------------------------
 gtk/gtkbuildableprivate.h              | 45 ++++++++++++++++++++++++++
 gtk/gtkbuilder-menus.c                 |  1 +
 gtk/gtkbuilder.c                       | 26 +++++++--------
 gtk/gtkbuilderparser.c                 |  2 +-
 gtk/gtkbuilderprecompile.c             |  2 +-
 gtk/gtkliststore.c                     |  2 +-
 gtk/gtktreestore.c                     |  2 +-
 gtk/gtkwidget.c                        | 26 +++++++--------
 gtk/inspector/misc-info.c              |  2 +-
 gtk/inspector/object-tree.c            |  2 +-
 gtk/tools/gtk-builder-tool-enumerate.c |  8 ++---
 gtk/tools/gtk-builder-tool-preview.c   |  2 +-
 testsuite/gtk/builder.c                |  6 ++--
 18 files changed, 124 insertions(+), 123 deletions(-)
---