diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-04-28 18:23:26 +0200 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-04-28 18:23:26 +0200 |
| commit | 0045d95a16be18092adfb40a9a5df944bcb99aea (patch) | |
| tree | adb1340a5d593a932785cbadb86db0bac2bc58cd | |
| parent | 51868d00e7a25ef9e587228e949964a765ed9d2d (diff) | |
| download | meson-0045d95a16be18092adfb40a9a5df944bcb99aea.zip meson-0045d95a16be18092adfb40a9a5df944bcb99aea.tar.gz meson-0045d95a16be18092adfb40a9a5df944bcb99aea.tar.bz2 | |
really switch to qmake automatically if pkg-config fails
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
| -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 70d2abc..342b1da 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -173,7 +173,7 @@ class QtBaseDependency(ExternalDependency): if DependencyMethods.PKGCONFIG in self.methods: self._pkgconfig_detect(mods, kwargs) methods.append('pkgconfig') - if not self.is_found and DependencyMethods.QMAKE in self.methods: + if not self.is_found or DependencyMethods.QMAKE in self.methods: from_text = self._qmake_detect(mods, kwargs) methods.append('qmake-' + self.name) methods.append('qmake') |