From 147d2a3f4b83bc0d370ee1cc1576a3defeab4a74 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 4 May 2015 04:58:15 +0300 Subject: Fix Qt5 on pkg-config platforms again. --- dependencies.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dependencies.py') diff --git a/dependencies.py b/dependencies.py index 8599c6629..bf8081581 100644 --- a/dependencies.py +++ b/dependencies.py @@ -559,7 +559,7 @@ class Qt5Dependency(Dependency): if len(mods) == 0: raise DependencyException('No Qt5 modules specified.') if shutil.which('pkg-config') is not None: - self.pkgconf_detect() + self.pkgconfig_detect(mods, kwargs) elif shutil.which('qmake') is not None: self.qmake_detect(mods, kwargs) if not self.is_found: @@ -571,11 +571,10 @@ class Qt5Dependency(Dependency): modules = [] for module in mods: modules.append(PkgConfigDependency('Qt5' + module, kwargs)) - self.version = modules[0].get_version() for m in modules: self.cargs += m.get_compile_args() self.largs += m.get_link_args() - + self.is_found = True def qmake_detect(self, mods, kwargs): pc = subprocess.Popen(['qmake', '-v'], stdout=subprocess.PIPE, -- cgit v1.2.3