[gtk: 3/3] Merge branch 'default-settings-non-debug' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 9f73f0234ad44a7984b1dd3155a8c91e8e5b9fd6
Merge: 3667c6b053 a4f067481c
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Aug 30 18:09:28 2021 +0000

    Merge branch 'default-settings-non-debug' into 'master'
    
    Revert "reftests: Enforce default settings"
    
    See merge request GNOME/gtk!3903

 gdk/gdk.c                        |  2 +-
 gdk/wayland/gdkdisplay-wayland.c |  2 +-
 gdk/x11/gdkxftdefaults.c         |  6 +++---
 testsuite/reftests/gtk-reftest.c | 33 ---------------------------------
 4 files changed, 5 insertions(+), 38 deletions(-)
---