diff options
| -rw-r--r-- | mesonbuild/dependencies.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 04a22f9..eb7a5e4 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -1136,7 +1136,7 @@ class QtBaseDependency(Dependency): self.cargs.append('-I' + incdir) libdir = qvars['QT_INSTALL_LIBS'] # Used by self.compilers_detect() - self.bindir = qvars['QT_INSTALL_BINS'] + self.bindir = self.get_qmake_host_bins(qvars) self.is_found = True for module in mods: mincdir = os.path.join(incdir, 'Qt' + module) @@ -1168,7 +1168,15 @@ class QtBaseDependency(Dependency): self.cargs += fwdep.get_compile_args() self.largs += fwdep.get_link_args() # Used by self.compilers_detect() - self.bindir = qvars['QT_INSTALL_BINS'] + self.bindir = self.get_qmake_host_bins(qvars) + + def get_qmake_host_bins(self, qvars): + # Prefer QT_HOST_BINS (qt5, correct for cross and native compiling) + # but fall back to QT_INSTALL_BINS (qt4) + if 'QT_HOST_BINS' in qvars: + return qvars['QT_HOST_BINS'] + else: + return qvars['QT_INSTALL_BINS'] def get_version(self): return self.version |