diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-06 16:14:44 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-06 18:35:59 +0000 |
| commit | f9f3a51243ee6ef3ed7ee44574faa164f4cc9d13 (patch) | |
| tree | 4458fce16aba38d01ecb4030fab4a48a6321ee17 | |
| parent | 4ee07dd1658771003c521f7671cc591cee130a2b (diff) | |
| download | meson-f9f3a51243ee6ef3ed7ee44574faa164f4cc9d13.zip meson-f9f3a51243ee6ef3ed7ee44574faa164f4cc9d13.tar.gz meson-f9f3a51243ee6ef3ed7ee44574faa164f4cc9d13.tar.bz2 | |
Revert "really switch to qmake automatically if pkg-config fails"
This reverts commit 0045d95a16be18092adfb40a9a5df944bcb99aea.
<jeandet> nirbheek, it seems 0045d95a16be18092adfb40a9a5df944bcb99aea is
really wrong, I've tested on Ubuntu. While writing this line I was
thinking that you can't have Qt without a working qmake in the path. On
Ubuntu you have that qtchooser stuff which is misleading.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index b07b0ae..898f4ed 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -215,7 +215,7 @@ class QtBaseDependency(ExternalDependency): if DependencyMethods.PKGCONFIG in self.methods: self._pkgconfig_detect(mods, kwargs) methods.append('pkgconfig') - if not self.is_found or DependencyMethods.QMAKE in self.methods: + if not self.is_found and DependencyMethods.QMAKE in self.methods: from_text = self._qmake_detect(mods, kwargs) methods.append('qmake-' + self.name) methods.append('qmake') |