From f9f3a51243ee6ef3ed7ee44574faa164f4cc9d13 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 6 Jun 2018 16:14:44 +0530 Subject: [PATCH] Revert "really switch to qmake automatically if pkg-config fails" This reverts commit 0045d95a16be18092adfb40a9a5df944bcb99aea. 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. --- mesonbuild/dependencies/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index b07b0ae9f..898f4ed0f 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')