summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-25 13:23:34 (GMT)
committerTobias Markmann <tm@ayena.de>2015-06-25 13:23:34 (GMT)
commit595fdfa75d4757d5654bf3189c23c85a66ec6836 (patch)
tree42481945819abab46424dfebf2a24fe077c53f14
parente9a95bd55757cce0e6e126660bc65561ae007baf (diff)
downloadswift-595fdfa75d4757d5654bf3189c23c85a66ec6836.zip
swift-595fdfa75d4757d5654bf3189c23c85a66ec6836.tar.bz2
Fix qt4.py tool for Arch
The tool had syntax errors (missing subprocess. in front of PIPE) and SCons errors (missing conf.Finish() calls). Test-Information: Tested on Arch Linux 1.4. Change-Id: Ibab23e1dc776ee9fe96de45221c4fb9659f4a185
-rw-r--r--BuildTools/SCons/Tools/qt4.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 625f807..1fe2294 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -209,7 +209,7 @@ def _detect(env):
moc = env.WhereIs('moc-qt4') or env.WhereIs('moc4') or env.WhereIs('moc')
if moc:
# Test whether the moc command we found is real, or whether it is just the qtchooser dummy.
- p = subprocess.Popen([moc, "-v"], shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+ p = subprocess.Popen([moc, "-v"], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
p.communicate()
if p.returncode == 0:
import sys
@@ -516,11 +516,13 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
# Check if Qt is registered at pkg-config
ret = test_conf.TryAction('pkg-config --exists \'%s\'' % modules_str)[0]
if ret != 1:
+ test_conf.Finish()
raise Exception("Qt has not been found using pkg-config.")
return
test_conf.env.ParseConfig("pkg-config --cflags --libs " + modules_str)
self.AppendUnique(LIBS=test_conf.env["LIBS"], LIBPATH=test_conf.env["LIBPATH"], CPPPATH=test_conf.env["CPPPATH"])
self["QT4_MOCCPPPATH"] = self["CPPPATH"]
+ test_conf.Finish()
return
if sys.platform == "win32" or crosscompiling :