diff options
| author | Philippe Payant <philippe@inrosoftware.com> | 2017-06-21 13:34:59 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-27 11:56:21 -0400 |
| commit | 85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd (patch) | |
| tree | d7b34d8467e8f1a6f0832463d8fe8f35d4f48b3b | |
| parent | ad1b487285b4b413f76b651e15a5f673f86c3868 (diff) | |
| download | meson-85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd.zip meson-85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd.tar.gz meson-85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd.tar.bz2 | |
Library names for Qt4 was incorrect.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 7cc8bb4..af515db 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 |