summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-06-23 08:45:51 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-06-23 08:46:09 (GMT)
commitc4f1c078ca0d6a9d6fe93655da5fb6010cc6e050 (patch)
tree93289bc71171db64e049bc21c903e87013ac7206 /BuildTools/SCons
parentc64bfb54c72f5fab80cd6f3e3202f8c09064ecf3 (diff)
downloadswift-c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050.zip
swift-c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050.tar.bz2
Fixed .qrc dependencies not being tracked.
Resolves: #1134
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/qt4.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index d9e41d8..671fd08 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -55,7 +55,7 @@ class QtdirNotFound(ToolQtWarning):
SCons.Warnings.enableWarningClass(ToolQtWarning)
-qrcinclude_re = re.compile(r'<file>([^<]*)</file>', re.M)
+qrcinclude_re = re.compile(r'<file (alias=\"[^\"]*\")?>([^<]*)</file>', re.M)
def transformToWinePath(path) :
return os.popen('winepath -w "%s"'%path).read().strip().replace('\\','/')
@@ -328,7 +328,7 @@ def generate(env):
result.append(itemPath)
return result
contents = node.get_contents()
- includes = qrcinclude_re.findall(contents)
+ includes = [included[1] for included in qrcinclude_re.findall(contents)]
qrcpath = os.path.dirname(node.path)
dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]
# dirs need to include files recursively