diff options
| author | Russel Winder <russel@winder.org.uk> | 2015-12-24 16:32:14 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2015-12-24 16:32:14 (GMT) |
| commit | 2a270c8f314e959c78e9deda29c8f250bb934dd6 (patch) | |
| tree | 7008e644357036404f0861c8ba1bbbf43b2b4123 /test/QT | |
| parent | a7d764ed831fa3243aa0bd3307f641e1e1f9f8a8 (diff) | |
| parent | 9d558dd65deacc958edc1f0da2dab1ec56ff4e4e (diff) | |
| download | SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.zip SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.tar.gz SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.tar.bz2 | |
Post merge commit for safety. Building Fortran code works, but tests fail.
Diffstat (limited to 'test/QT')
| -rw-r--r-- | test/QT/manual.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/QT/manual.py b/test/QT/manual.py index ff38f32..d911fb3 100644 --- a/test/QT/manual.py +++ b/test/QT/manual.py @@ -46,13 +46,15 @@ sources = ['aaa.cpp', 'bbb.cpp', 'ddd.cpp', 'eee.cpp', 'main.cpp'] # normal invocation sources.append(env.Moc('include/aaa.h')) -env.Moc('bbb.cpp') +moc = env.Moc('bbb.cpp') +env.Ignore( moc, moc ) sources.extend(env.Uic('ui/ccc.ui')[1:]) # manual target specification sources.append(env.Moc('moc-ddd.cpp', 'include/ddd.h', QT_MOCHPREFIX='')) # Watch out ! -env.Moc('moc_eee.cpp', 'eee.cpp') +moc = env.Moc('moc_eee.cpp', 'eee.cpp') +env.Ignore( moc, moc ) sources.extend(env.Uic(['include/uic_fff.hpp', 'fff.cpp', 'fff.moc.cpp'], 'ui/fff.ui')[1:]) |