From c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 23 Jun 2012 10:45:51 +0200
Subject: Fixed .qrc dependencies not being tracked.

Resolves: #1134

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
-- 
cgit v0.10.2-6-g49f6