From acd41beef1b68928133c713f40ba2d6f683ed23b Mon Sep 17 00:00:00 2001 From: Alexander Afanasyev Date: Tue, 14 Feb 2017 22:30:10 -0800 Subject: [PATCH] qt5: Workaround for QT5 detection on macOS (Bug #1910) --- waflib/Tools/qt5.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/waflib/Tools/qt5.py b/waflib/Tools/qt5.py index 2aaf1fa1..61327502 100644 --- a/waflib/Tools/qt5.py +++ b/waflib/Tools/qt5.py @@ -718,11 +718,13 @@ def set_qt5_libs_to_check(self): pat = pat.replace('.dll', '.lib') if self.environ.get('QT5_FORCE_STATIC'): pat = self.env.cxxstlib_PATTERN - re_qt = re.compile(pat % '(?PQt5.*)' + '$') + if Utils.unversioned_sys_platform() == 'darwin': + pat = "%s\.framework" + re_qt = re.compile(pat%'Qt5?(?P.*)'+'$') for x in dirlst: m = re_qt.match(x) if m: - self.qt5_vars.append(m.group('name')) + self.qt5_vars.append("Qt5%s" % m.group('name')) if not self.qt5_vars: self.fatal('cannot find any Qt5 library (%r)' % self.env.QTLIBS)