diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-06 20:05:34 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-06 20:05:34 +0300 |
| commit | c55ceee0801de9e4ac5ed0106920e88e6f021528 (patch) | |
| tree | d4341908c214514c61abdeafef676990e19a5c79 | |
| parent | ac81594952501b2e7e7f2c59a972503437954f51 (diff) | |
| download | meson-c55ceee0801de9e4ac5ed0106920e88e6f021528.zip meson-c55ceee0801de9e4ac5ed0106920e88e6f021528.tar.gz meson-c55ceee0801de9e4ac5ed0106920e88e6f021528.tar.bz2 | |
No moc prefix for source files.
| -rw-r--r-- | dependencies.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/mocinclude.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py index b670d14..47bd1c0 100644 --- a/dependencies.py +++ b/dependencies.py @@ -519,7 +519,7 @@ class Qt5Dependency(Dependency): 'moc_@BASENAME@.cpp', 'moc_headers', 'moc_hdr_compile', 'Compiling header @INFILE@ with the moc preprocessor') mocsrc_rule = CustomRule([self.moc.get_command(), '@INFILE@', '-o', '@OUTFILE@'], - 'moc@BASENAME@.moc', 'moc_sources', 'moc_src_compile', + '@BASENAME@.moc', 'moc_sources', 'moc_src_compile', 'Compiling source @INFILE@ with the moc preprocessor') ui_rule = CustomRule([self.uic.get_command(), '@INFILE@', '-o', '@OUTFILE@'], 'ui_@BASENAME@.h', 'ui_files', 'ui_compile', diff --git a/test cases/frameworks/4 qt5/mocinclude.cpp b/test cases/frameworks/4 qt5/mocinclude.cpp index 7c18867..2693113 100644 --- a/test cases/frameworks/4 qt5/mocinclude.cpp +++ b/test cases/frameworks/4 qt5/mocinclude.cpp @@ -9,4 +9,4 @@ int mocfunc() { return 0; } -#include"mocmocinclude.moc" +#include"mocinclude.moc" |