diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-13 15:54:30 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-13 16:50:09 +0530 |
| commit | 69aafd141eba8a60ce5f092438bae65211a23db3 (patch) | |
| tree | 64db66845940db919e5ff6f1c53975016deea7f3 /mesonbuild/scripts | |
| parent | b2a39dd06ee139152d5522c961e6ba04acdec791 (diff) | |
| download | meson-69aafd141eba8a60ce5f092438bae65211a23db3.zip meson-69aafd141eba8a60ce5f092438bae65211a23db3.tar.gz meson-69aafd141eba8a60ce5f092438bae65211a23db3.tar.bz2 | |
qt: Fix qmake detection on Linux and Windows
qmake for both Qt4 and Qt5 detection was assuming that it was only used
on Windows, which is incorrect. It can also be used on Linux for
cross-compilation or in general when pkg-config is not available.
It was also not failing properly for both Qt5 and Qt4 when no libraries
were found, and was assuming that the .dll was always available.
Qt4 detection with qmake was also completely broken.
Also prevents unwanted injection of partially-found qt dependencies in
targets by unsetting self.cargs and self.largs
Diffstat (limited to 'mesonbuild/scripts')
0 files changed, 0 insertions, 0 deletions