diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-09 02:25:50 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-11 01:51:02 +0530 |
commit | 19a06d90330756c8b02e7f6f3dfef150d85efd1f (patch) | |
tree | 34de689005d7166433874f23234797c1ea1aaec1 /manual tests | |
parent | a72740a0d1a5cbf877d448201f856767fa8be025 (diff) | |
download | meson-19a06d90330756c8b02e7f6f3dfef150d85efd1f.zip meson-19a06d90330756c8b02e7f6f3dfef150d85efd1f.tar.gz meson-19a06d90330756c8b02e7f6f3dfef150d85efd1f.tar.bz2 |
qt4, qt5 modules: Improve moc/uic/rcc detection
Instead of blindly searching in PATH, use
Qt5Dependency.compilers_detect() (same for qt4) to get moc/uic/rcc.
This is much more robust, and it improves the chances that the correct
ones will be found. We still manually verify for now because the
fallback in dependencies.py for searching is stll to look in PATH for
backwards-compat, and because people probably have setups like that.
Also sync the qt4 module with the qt5 module w.r.t. resource compilation
and make the compiled qrc.cpp file unique in terms of the framework
version used (4 vs 5). This is needed for the test to work properly,
which now covers both Qt4 and 5.
Diffstat (limited to 'manual tests')
0 files changed, 0 insertions, 0 deletions