[gtk: 4/4] Merge branch 'macos' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit e00785e9588be8f94ef0060677062bb07c396465
Merge: 4e2a263c1f 12d591178e
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 6 15:26:49 2021 +0000

    Merge branch 'macos' into 'master'
    
    Fix building both X11 and Quartz backends on macOS
    
    See merge request GNOME/gtk!3508

 config.h.meson                    | 3 +++
 gdk/x11/gdkapplaunchcontext-x11.c | 5 ++++-
 gtk/meson.build                   | 3 +--
 meson.build                       | 1 +
 testsuite/gtk/meson.build         | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
---