[gtk: 3/3] Merge branch 'fix-builder-parsing' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit b17005ddabd1d4a2feff3dd03e1794839e4d2764
Merge: 30a741e6af ec62402908
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 28 04:32:30 2021 +0000

    Merge branch 'fix-builder-parsing' into 'master'
    
    builder: Fix parsing of mixed declarations
    
    Closes #4208
    
    See merge request GNOME/gtk!3997

 gtk/gtkbuilder.c                        | 16 ++++++++++++++--
 gtk/gtkbuilderparser.c                  |  9 +--------
 gtk/gtkbuilderprivate.h                 |  6 +++---
 testsuite/reftests/late-property.ref.ui | 18 ++++++++++++++++++
 testsuite/reftests/late-property.ui     | 18 ++++++++++++++++++
 testsuite/reftests/meson.build          |  2 ++
 6 files changed, 56 insertions(+), 13 deletions(-)
---