From e927d834071d1ba06a652b685866bc6377da4490 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 8 Nov 2019 11:21:41 +0100 Subject: 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 --- mkspecs/features/metatypes.prf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs/features') 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 -- cgit v1.2.3