Library names for Qt4 was incorrect.

8 years ago · 85eddf4eb2
parent ad1b487285
commit 85eddf4eb2
1 changed files with 6 additions and 2 deletions
--- 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