[gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 758675f44efe6d64ee1614aee96600c23f73655f
Merge: 4c3eb7c6f7 8fcd4ac0f9
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 9 13:35:57 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3242 and #3240
    
    See merge request GNOME/gtk!2679

 demos/gtk-demo/demo.gresource.xml    |  2 +-
 demos/gtk-demo/listview_ucd.c        | 20 ++++++++++++++++----
 docs/reference/gtk/migrating-3to4.md | 36 +++++++++++++++++++++++++++---------
 gtk/gtkmain.c                        |  7 +++++--
 gtk/gtkwindow.c                      |  4 ++--
 meson.build                          |  3 ++-
 6 files changed, 53 insertions(+), 19 deletions(-)
---