diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-11 13:02:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-13 15:26:03 +0000 |
| commit | 1e5d1a43dc14240b24615d4cc9a291d5237ea8bf (patch) | |
| tree | e03c133c3a2f03a03ffe676724f7ace5704081a2 /mkspecs/features/metatypes.prf | |
| parent | 63dae62b7fc6105a45dc88e01d205c89bcf0b683 (diff) | |
Make sure the metatypes are installed in prefix builds
The JSON collection step has to be target_predeps in order to be
executed if the only place its output is referred to is INSTALLS.
Furthermore, some CONFIG options clear the INSTALLS variable.
Therefore, we need to add the metatypes CONFIG entries after
those.
Change-Id: I4694ab1d82c13cb4e3886c1722a03255d14b7f29
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'mkspecs/features/metatypes.prf')
| -rw-r--r-- | mkspecs/features/metatypes.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index c6a655c7f1..c2eb8d8659 100644 --- a/mkspecs/features/metatypes.prf +++ b/mkspecs/features/metatypes.prf @@ -28,7 +28,7 @@ moc_json_source.variable_out = MOC_JSON_FILES MOC_COLLECT_JSON_OUTPUT = $$lower($$basename(TARGET))_metatypes.json -moc_collect_json.CONFIG += no_link combine +moc_collect_json.CONFIG += no_link combine target_predeps moc_collect_json.commands = $$MOC_COLLECT_JSON --collect-json -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} moc_collect_json.input = MOC_JSON_FILES moc_collect_json.output = $$MOC_COLLECT_JSON_OUTPUT |