aboutsummaryrefslogtreecommitdiff
path: root/dependencies.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-06-22 17:13:31 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-06-22 17:13:31 +0300
commitf1cc6337999f56e56948eca20a9d18ffb4ab0b12 (patch)
tree2ff83013ce7fb7687d633705dcf4ef35e13248a3 /dependencies.py
parentd2b5e5c7a5cadc221bdc604cab12716238dbe4db (diff)
downloadmeson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.zip
meson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.tar.gz
meson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.tar.bz2
And the custom rules too.
Diffstat (limited to 'dependencies.py')
-rw-r--r--dependencies.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/dependencies.py b/dependencies.py
index 6b6f158..c9ed8bc 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -529,17 +529,17 @@ class Qt5Dependency(Dependency):
return True
def get_generate_rules(self):
- moc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'],
+ moc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'],
'moc_@BASENAME@.cpp', 'moc_headers', 'moc_hdr_compile',
'Compiling header @INFILE@ with the moc preprocessor')
- mocsrc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'],
+ mocsrc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'],
'@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',
'Compiling @INFILE@ with the ui compiler')
rrc_rule = CustomRule([self.rcc.get_command(), '@INFILE@', '-o', '@OUTFILE@',
- '${rcc_flags}'], '@BASENAME@.cpp','qresources',
+ '${rcc_args}'], '@BASENAME@.cpp','qresources',
'rc_compile', 'Compiling @INFILE@ with the rrc compiler')
return [moc_rule, mocsrc_rule, ui_rule, rrc_rule]