[gtk: 14/14] Merge branch 'wip/baedert/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit ebc8b01718a39c18b42226138440685c829217ac
Merge: cf5e923d84 db76b52744
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 19 22:40:57 2020 +0000

    Merge branch 'wip/baedert/for-master' into 'master'
    
    Wip/baedert/for master
    
    See merge request GNOME/gtk!1935

 examples/bp/bloatpad.c                      |  1 +
 examples/bp/meson.build                     |  2 +-
 gtk/gtkcssunsetvalue.c                      |  2 +-
 gtk/gtkprinteroption.c                      |  4 +-
 gtk/gtkprinteroption.h                      | 12 +++---
 gtk/gtktext.c                               |  4 +-
 gtk/gtktreeview.c                           | 38 ++++++-----------
 gtk/tools/gtk-builder-tool-enumerate.c      |  3 +-
 gtk/tools/gtk-builder-tool-preview.c        | 17 +++++++-
 gtk/tools/gtk-builder-tool-simplify.c       |  3 +-
 gtk/tools/gtk-builder-tool-validate.c       |  5 +--
 gtk/tools/gtk-builder-tool.c                |  8 +---
 gtk/tools/gtk-builder-tool.h                | 10 +++++
 gtk/tools/meson.build                       |  2 +-
 modules/printbackends/gtkcupssecretsutils.c | 20 ++++++---
 modules/printbackends/gtkcupsutils.c        | 13 +++---
 modules/printbackends/gtkprintbackendcups.c | 63 +++++++++++++++--------------
 modules/printbackends/gtkprintbackendfile.c | 26 ++++++------
 modules/printbackends/meson.build           |  2 +-
 tests/testgtk.c                             |  2 +-
 testsuite/a11y/children.c                   |  2 +-
 testsuite/a11y/derive.c                     |  3 ++
 testsuite/a11y/meson.build                  |  1 +
 testsuite/a11y/tree-relationships.c         |  2 +-
 testsuite/gsk/compare-render.c              | 15 ++++---
 testsuite/gsk/meson.build                   |  2 +
 testsuite/gsk/reftest-compare.c             | 18 ++++-----
 testsuite/gtk/meson.build                   |  1 +
 testsuite/gtk/treeview.c                    |  2 +-
 testsuite/reftests/meson.build              | 13 +++++-
 testsuite/reftests/reftest-compare.c        | 18 ++++-----
 testsuite/reftests/reftest-module.c         |  2 +-
 32 files changed, 180 insertions(+), 136 deletions(-)
---