From 85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd Mon Sep 17 00:00:00 2001 From: Philippe Payant Date: Wed, 21 Jun 2017 13:34:59 -0400 Subject: [PATCH] Library names for Qt4 was incorrect. --- mesonbuild/dependencies/ui.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 7cc8bb40f..af515db73 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -291,10 +291,14 @@ class QtBaseDependency(ExternalDependency): mincdir = os.path.join(incdir, 'Qt' + module) self.compile_args.append('-I' + mincdir) if for_windows(self.env.is_cross_build(), self.env): - libfile = os.path.join(libdir, self.qtpkgname + module + '.lib') + if self.qtver == '4': + base_name = 'Qt' + module + '4' + else: + base_name = 'Qt5' + module + libfile = os.path.join(libdir, base_name + '.lib') if not os.path.isfile(libfile): # MinGW can link directly to .dll - libfile = os.path.join(self.bindir, self.qtpkgname + module + '.dll') + libfile = os.path.join(self.bindir, base_name + '.dll') if not os.path.isfile(libfile): self.is_found = False break