[glib: 2/2] Merge branch 'wip/issue-1884' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 205045e5c71bc1df2f56d4d15ddb2f8d3f428f4c
Merge: 02b298cf0 2632ed7a6
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jun 4 12:09:24 2021 +0000

    Merge branch 'wip/issue-1884' into 'master'
    
    gsettings: Resolve child schemas from the parent's schema source
    
    Closes #1884
    
    See merge request GNOME/glib!2132

 gio/gsettings.c                                 | 22 +++++++++-------------
 gio/gsettingsschema-internal.h                  |  3 +++
 gio/gsettingsschema.c                           | 18 ++++++++++++++++++
 gio/tests/gsettings.c                           | 11 ++++++++---
 gio/tests/org.gtk.schemasourcecheck.gschema.xml |  3 ++-
 5 files changed, 40 insertions(+), 17 deletions(-)
---