test

git-svn-id: https://waf.googlecode.com/svn/trunk@10778 f0382ac9-c320-0410-b3f0-b508d59f5a85

diff --git a/waflib/Tools/qt4.py b/waflib/Tools/qt4.py
index e4ca087532af467624e89e4f24612b0cef5a7f9a..ede079a47f598fcf3735c8aa696cd41bdcd1d671 100644 (file)
--- a/waflib/Tools/qt4.py
+++ b/waflib/Tools/qt4.py
@@ -143,10 +143,14 @@ class qxx(cxx.cxx):
 
                        if not ext:
                                base2 = d[:-4]
-                               for exth in MOC_H:
-                                       k = node.parent.find_node(base2+exth)
-                                       if k:
-                                               break
+                               for node in [node.parent] + self.generator.includes_nodes:
+                                       for exth in MOC_H:
+                                               k = node.parent.find_node(base2+exth)
+                                               if k:
+                                                       break
+                                       else:
+                                               continue
+                                       break
                                else:
                                        raise Errors.WafError('no header found for %r which is a moc file' % d)