summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-08-13 21:37:16 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-13 21:37:16 (GMT)
commit45ee9d006bf2de28f5aba08fdb52b986b3019cb9 (patch)
tree69c4190345c4c4751f71b2e98814cf6815689a4d /BuildTools/SCons
parent08def2a4b457073087a89a3c63d200cbe86c8c16 (diff)
parent946a94332761a058c6842e543d7e625bc5e9c9e1 (diff)
downloadswift-45ee9d006bf2de28f5aba08fdb52b986b3019cb9.zip
swift-45ee9d006bf2de28f5aba08fdb52b986b3019cb9.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed Qt SCons tool on Linux 3.0 systems.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/qt4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 0f2e976..2c40454 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -445,7 +445,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
except: pass
debugSuffix = ''
- if sys.platform in ["linux2"] and not crosscompiling :
+ if sys.platform.startswith("linux") and not crosscompiling :
if debug : debugSuffix = '_debug'
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
for module in modules :