diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-11 23:23:05 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-11 23:23:05 +0300 |
| commit | 55dba78889a7a09fdc5d6a2b0b2033861513824d (patch) | |
| tree | 3a760806653546f16f57967cb1257cb2a4ea767d /ninjabackend.py | |
| parent | 44361baff18d3b33a0b0299a5c6f847938521e21 (diff) | |
| download | meson-55dba78889a7a09fdc5d6a2b0b2033861513824d.zip meson-55dba78889a7a09fdc5d6a2b0b2033861513824d.tar.gz meson-55dba78889a7a09fdc5d6a2b0b2033861513824d.tar.bz2 | |
Follow Qt standards w.r.t. moc file including.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 7d7d91b..8215959 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -817,16 +817,7 @@ class NinjaBackend(backends.Backend): elem.add_item('rcc_flags', ['--name', basename]) elem.write(outfile) if self.is_compilable_file(outfilename): - if rule.name == 'moc_hdr_compile': - include_mocs = target.get_original_kwargs().get('include_moc_files', True) - if not isinstance(include_mocs, bool): - raise InvalidArguments('Include_moc_files kwarg must be boolean.') - if include_mocs: - src_deps.append(outfilename) - else: - other_deps.append(outfilename) - else: - src_deps.append(outfilename) + src_deps.append(outfilename) else: other_deps.append(outfilename) if rule.name == 'moc_src_compile': #HACK |