[gjs: 3/3] Merge branch 'fmuellner/gjs-gtk4-templates'

[Philip Chimento <pchimento src gnome org>]

commit 83d8de553c5a6b8b51bad5edc7b2d9fd24ba02d9
Merge: 86af6da4 0db7f3a1
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Apr 16 16:49:56 2020 -0700

    Merge branch 'fmuellner/gjs-gtk4-templates'
    
    See merge request GNOME/gjs!420

 installed-tests/js/{complex.ui => complex3.ui} |   0
 installed-tests/js/complex4.ui                 |  26 ++++
 installed-tests/js/jsunit.gresources.xml       |   3 +-
 installed-tests/js/meson.build                 |   6 +-
 installed-tests/js/{testGtk.js => testGtk3.js} |   4 +-
 installed-tests/js/testGtk4.js                 | 195 +++++++++++++++++++++++++
 installed-tests/js/testLegacyGtk.js            |   2 +-
 meson.build                                    |   4 +
 modules/core/overrides/Gtk.js                  |  61 ++++++--
 9 files changed, 282 insertions(+), 19 deletions(-)
---