diff options
| author | Philippe Payant <philippe@inrosoftware.com> | 2017-06-21 13:34:59 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-29 14:52:27 +0530 |
| commit | 4b84d136b9f0ae602fcd48105787939546ae4c37 (patch) | |
| tree | eda65e75f56ac070f33fd8b5e973744d241b4bcf | |
| parent | 1def456fc12a24c6b6438f9034176f3f5f6e3c56 (diff) | |
| download | meson-4b84d136b9f0ae602fcd48105787939546ae4c37.zip meson-4b84d136b9f0ae602fcd48105787939546ae4c37.tar.gz meson-4b84d136b9f0ae602fcd48105787939546ae4c37.tar.bz2 | |
Library names for Qt4 was incorrect.
Closes https://github.com/mesonbuild/meson/issues/1979
| -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 |