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

[Matthias Clasen <matthiasc src gnome org>]

commit 962c4d6a6969bd406e6241a21eec47cbf807a718
Merge: 930d779eb3 0f053d1804
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 22 20:59:44 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    text: Avoid clash of preedit and placeholder
    
    See merge request GNOME/gtk!1955

 demos/gtk-demo/dnd.c                    | 532 +++++++++++++++++++-------------
 gtk/gtkcolorswatch.c                    |   1 -
 gtk/gtkdragsource.c                     |   9 +
 gtk/gtkmain.c                           |   6 +-
 gtk/gtktext.c                           |   6 +-
 testsuite/reftests/background-origin.ui |  12 +
 testsuite/reftests/meson.build          |   1 -
 7 files changed, 353 insertions(+), 214 deletions(-)
---