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

[Matthias Clasen <matthiasc src gnome org>]

commit 9007d153c8710d8b969a9142e96c006a8ec492b6
Merge: 6e594da5f2 8ca612c966
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Oct 4 13:56:30 2020 +0000

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

 demos/widget-factory/widget-factory.ui            |  5 +--
 docs/reference/gtk/migrating-3to4.md              |  9 +++++
 gtk/gtkemojicompletion.c                          |  4 +--
 gtk/gtkscale.c                                    |  3 +-
 gtk/tools/gtk-builder-tool-simplify.c             | 43 +++++++++++++++++++++++
 testsuite/css/nodes/scale.ui                      |  2 ++
 testsuite/gtk/focus-chain/widget-factory.ui       |  2 ++
 testsuite/gtk/focus-chain/widget-factory2.ui      |  2 ++
 testsuite/gtk/focus-chain/widget-factory3.ui      |  2 ++
 testsuite/tools/simplify-data-3to4/scale.expected | 14 ++++++++
 testsuite/tools/simplify-data-3to4/scale.ui       | 10 ++++++
 11 files changed, 90 insertions(+), 6 deletions(-)
---