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

[Matthias Clasen <matthiasc src gnome org>]

commit d45aabb4ec7689c677745af990e526822c37f882
Merge: e3bab0b766 9f03462ffb
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Sep 14 04:45:07 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2570

 NEWS                                 |  27 ++-
 demos/gtk-demo/fishbowl.ui           |   3 +
 demos/gtk-demo/iconscroll.c          |  31 ++++
 demos/gtk-demo/iconscroll.ui         |   7 +
 demos/gtk-demo/themes.c              |  72 +-------
 demos/gtk-demo/themes.ui             |   6 +-
 docs/reference/gdk/gdk4-sections.txt |   1 +
 docs/reference/gtk/gtk4-docs.xml     |   1 -
 docs/reference/gtk/gtk4-sections.txt |  43 ++---
 docs/reference/gtk/migrating-3to4.md |  56 ++++---
 gdk/gdkframeclock.c                  |  17 +-
 gdk/gdkframeclock.h                  |   3 +
 gtk/gtkcolorchooserwidget.c          |  16 ++
 gtk/gtkdebug.h                       |   6 +-
 gtk/gtkiconview.c                    |   8 +-
 gtk/gtkmain.c                        | 311 +++++++++--------------------------
 gtk/gtkmain.h                        |  25 +--
 gtk/gtkrender.h                      |   8 -
 gtk/gtkversion.c                     | 179 ++++++++++++++++++++
 gtk/gtkversion.h.in                  |  30 +++-
 gtk/inspector/fpsoverlay.c           |  32 +---
 gtk/inspector/visual.c               |  13 +-
 gtk/meson.build                      |   1 +
 23 files changed, 451 insertions(+), 445 deletions(-)
---