diff options
| author | Steven Knight <knight@baldmt.com> | 2004-05-19 17:49:55 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-05-19 17:49:55 (GMT) |
| commit | 04ebe107191659f805bd63148c61c1026efeb686 (patch) | |
| tree | 9122729d1120c1119fe10ff360f4675789ca8f9b /src/engine/SCons/Tool/qt.py | |
| parent | 12d2ae1193b9e32e0164218bb73240791914f976 (diff) | |
| download | SCons-04ebe107191659f805bd63148c61c1026efeb686.zip SCons-04ebe107191659f805bd63148c61c1026efeb686.tar.gz SCons-04ebe107191659f805bd63148c61c1026efeb686.tar.bz2 | |
Fix spurious rebuilds/reinstalls of header files and circular dependencies with generated header files by allowing Scanners to be associated explicitly with Builders, not just through Scanner file suffix lists.
Diffstat (limited to 'src/engine/SCons/Tool/qt.py')
| -rw-r--r-- | src/engine/SCons/Tool/qt.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py index f8234ba..a0dfed8 100644 --- a/src/engine/SCons/Tool/qt.py +++ b/src/engine/SCons/Tool/qt.py @@ -116,7 +116,7 @@ class _Automoc: out_sources.append(moc_o) objBuilder(moc_o, moc_cpp) self.mocFromHBld(env, moc_cpp, h) - moc_cpp.target_scanner = SCons.Defaults.CScan + #moc_cpp.target_scanner = SCons.Defaults.CScan if cpp and q_object_search.search(cpp.get_contents()): # cpp file with Q_OBJECT macro found -> add moc # (to be included in cpp) @@ -126,7 +126,7 @@ class _Automoc: env['QT_MOCNAMEGENERATOR'](base, src_ext, env))) self.mocFromCppBld(env, moc, cpp) env.Ignore(moc, moc) - moc.source_scanner = SCons.Defaults.CScan + #moc.source_scanner = SCons.Defaults.CScan os.chdir(old_os_cwd) FS.chdir(old_fs_cwd) |