diff options
| author | Steven Knight <knight@baldmt.com> | 2005-10-13 13:26:39 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-10-13 13:26:39 (GMT) |
| commit | 23cba392cd6b316d2e641948954b4e2f001de73b (patch) | |
| tree | c6aab9a69e418efb3736aaa92dc5e5952c3511ba /src/engine | |
| parent | b66cc02737a68972e1302ea2ce041928a05720d1 (diff) | |
| download | SCons-23cba392cd6b316d2e641948954b4e2f001de73b.zip SCons-23cba392cd6b316d2e641948954b4e2f001de73b.tar.gz SCons-23cba392cd6b316d2e641948954b4e2f001de73b.tar.bz2 | |
Have the QT UIC Scanner use the env.FindFile method. (Leanid Nazdrynau)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/qt.py | 18 |
1 files changed, 8 insertions, 10 deletions
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", |