[gtk: 5/5] Merge branch 'flatpak-tweaks' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit c5e69e83b50cf9255c04fb5f58945b680800c810
Merge: bcfca52e9e 3e426e4c5b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Feb 12 14:03:54 2021 +0000

    Merge branch 'flatpak-tweaks' into 'master'
    
    Flatpak tweaks
    
    See merge request GNOME/gtk!3187

 build-aux/flatpak/org.gtk.Demo4.json          | 34 +++------------------------
 build-aux/flatpak/org.gtk.IconBrowser4.json   | 34 +++------------------------
 build-aux/flatpak/org.gtk.WidgetFactory4.json | 34 +++------------------------
 demos/gtk-demo/main.c                         | 15 +++++++++---
 demos/gtk-demo/meson.build                    |  2 ++
 demos/icon-browser/iconbrowserapp.c           | 16 ++++++++++---
 demos/icon-browser/meson.build                |  2 +-
 demos/meson.build                             | 16 +++++++++++++
 demos/node-editor/meson.build                 |  2 +-
 demos/node-editor/node-editor-application.c   | 16 ++++++++++---
 demos/print-editor/meson.build                |  2 +-
 demos/print-editor/print-editor.c             | 16 ++++++++++---
 demos/widget-factory/meson.build              |  2 +-
 demos/widget-factory/widget-factory.c         | 16 ++++++++++---
 meson_options.txt                             |  6 +++++
 15 files changed, 101 insertions(+), 112 deletions(-)
---