From 5209ff7a2231175518d43e064c425b3efb4ea15e Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 23 Aug 2019 14:51:06 +0200 Subject: scons: Also fix Python 2.7 compatibility in depends.py/qt5.py --- build/qt5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/qt5.py') diff --git a/build/qt5.py b/build/qt5.py index 15b7731554..092c2bca3c 100644 --- a/build/qt5.py +++ b/build/qt5.py @@ -550,9 +550,9 @@ def _find_qtdirs(qt5dir, module): else: module5 = module if not os.path.isdir(QT5LIBDIR): - QT5LIBDIR = subprocess.Popen(["pkg-config", "--variable=libdir", module5], stdout = subprocess.PIPE).communicate()[0].rstrip().decode() + QT5LIBDIR = subprocess.Popen(["pkg-config", "--variable=libdir", module5], stdout = subprocess.PIPE).communicate()[0].rstrip().decode('utf-8') if not os.path.isdir(QT5INCDIR): - QT5INCDIR = subprocess.Popen(["pkg-config", "--variable=includedir", module5], stdout = subprocess.PIPE).communicate()[0].rstrip().decode() + QT5INCDIR = subprocess.Popen(["pkg-config", "--variable=includedir", module5], stdout = subprocess.PIPE).communicate()[0].rstrip().decode('utf-8') finally: pass return QT5LIBDIR, QT5INCDIR, os.path.join(QT5INCDIR,module) -- cgit v1.2.3