Skip to content

Commit

Permalink
Fix Qt5 on pkg-config platforms again.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed May 4, 2015
1 parent 412f9f5 commit 147d2a3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ def __init__(self, kwargs):
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:
Expand All @@ -571,11 +571,10 @@ def pkgconfig_detect(self, mods, kwargs):
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,
Expand Down

0 comments on commit 147d2a3

Please sign in to comment.