diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-08 11:21:41 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-11 10:20:13 +0100 |
| commit | e927d834071d1ba06a652b685866bc6377da4490 (patch) | |
| tree | 6ef9c235d557e753946f1291e69f4d9a88f52f29 /mkspecs/features/metatypes.prf | |
| parent | 18753e5493153b0e880deff60fc67100abd99986 (diff) | |
Disambiguate do_install target in metatypes.prf
qmake matches those targets in a purely lexical way, disregarding any
scopes. do_install is much too generic and clashes with another
do_install target in the qmltypes installation code in qtdeclarative.
Change-Id: I8edab329eacc548cee880a9182a1e5ae4dd095fb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'mkspecs/features/metatypes.prf')
| -rw-r--r-- | mkspecs/features/metatypes.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index 64387458ac..515a472318 100644 --- a/mkspecs/features/metatypes.prf +++ b/mkspecs/features/metatypes.prf @@ -33,10 +33,10 @@ moc_collect_json.output = $$MOC_COLLECT_JSON_OUTPUT moc_collect_json.name = Collect moc JSON output into central file install_metatypes { - do_install.path = $$[QT_INSTALL_LIBS]/metatypes - do_install.files = $$OUT_PWD/$$MOC_COLLECT_JSON_OUTPUT - prefix_build: INSTALLS += do_install - else: COPIES += do_install + do_install_metatypes.path = $$[QT_INSTALL_LIBS]/metatypes + do_install_metatypes.files = $$OUT_PWD/$$MOC_COLLECT_JSON_OUTPUT + prefix_build: INSTALLS += do_install_metatypes + else: COPIES += do_install_metatypes } QMAKE_EXTRA_COMPILERS += moc_collect_json moc_json_header moc_json_source |