From 315b3b107eae29a8a909ed6b90becb972fafa75f Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 4 May 2015 13:02:45 -0700 Subject: [PATCH] use qmake with QT_SELECT since qmake-qt4 is not available on all platforms (fix #22) --- cmake/sip_configure.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py index df3778b..1373bbb 100644 --- a/cmake/sip_configure.py +++ b/cmake/sip_configure.py @@ -1,3 +1,4 @@ +from copy import copy import os import re import subprocess @@ -12,7 +13,10 @@ class Configuration(sipconfig.Configuration): def __init__(self): - qtconfig = subprocess.check_output(['qmake-qt4', '-query'], universal_newlines=True) + env = copy(os.environ) + env['QT_SELECT'] = '4' + qtconfig = subprocess.check_output( + ['qmake', '-query'], env=env, universal_newlines=True) qtconfig = dict(line.split(':', 1) for line in qtconfig.splitlines()) pyqtconfig = { 'qt_archdata_dir': qtconfig['QT_INSTALL_DATA'],