Have the QT UIC Scanner use the env.FindFile method. (Leanid Nazdrynau)

2 files changed, 11 insertions, 10 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 39c0c8a..e49d391 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -431,6 +431,9 @@ RELEASE 0.97 - XXX
 
   - Fix the Java parser's handling of backslashes in strings.
 
+  - Fix the Qt UIC scanner to work with generated .ui files (by using
+    the FindFile() function instead of checking by-hand for the file).
+
   From Christian Neeb:
 
   - Fix the Java parser's handling of string definitions to avoid ignoring
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py
index 04b6215..5077901 100644
--- a/src/engine/SCons/Tool/qt.py
+++ b/src/engine/SCons/Tool/qt.py
@@ -219,19 +219,17 @@ def uicEmitter(target, source, env):
     return target, source
 
 def uicScannerFunc(node, env, path):
-    #print "uicScannerFunc"
     dir = node.dir
+    lookout = []
+    lookout.extend(env['CPPPATH'])
+    lookout.append(str(node.rfile().dir))
     includes = re.findall("<include.*?>(.*?)</include>", node.get_contents())
-    res = []
+    result = []
     for incFile in includes:
-        incNode = dir.File(incFile)
-        if incNode.rexists():
-            #print "uicdep: ", incNode
-            res.append(dir.File(incFile))
-        else:
-            #print "uicdep: ", incNode, "not found"
-            pass
-    return res
+        dep = env.FindFile(incFile,lookout)
+        if dep:
+            result.append(dep)
+    return result
 
 uicScanner = SCons.Scanner.Scanner(uicScannerFunc,
                                    name = "UicScanner",