diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-08 11:18:25 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-08 14:51:41 +0100 |
| commit | c44106529719094385a27d171094a1440e3b4004 (patch) | |
| tree | 647fb85402cabea322ac700f5cb74df3e4666f8e /src | |
| parent | 9d89702ab26958dbd075de11041af0b230b1230b (diff) | |
Disambiguate do_install target for qmltypes
qmake does pure lexical matching on those names, disregarding any
scopes. Therefore, this target was the same as the do_install target in
metatypes.prf.
Change-Id: If06c01d7666ee1efc27d96c33cc9e0dabaa6ed80
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index d8e826c671..be44f73cec 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -76,11 +76,11 @@ qmltyperegistrar_qmltypes.commands = $$escape_expand(\\n) # force creation of r install_qmltypes { isEmpty(QMLTYPES_INSTALL_DIR): \ QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/$$TARGETPATH - do_install.files = $$QMLTYPES_FILENAME - do_install.path = $$QMLTYPES_INSTALL_DIR - do_install.CONFIG += no_link - prefix_build: INSTALLS += do_install - else: COPIES += do_install + do_install_qmltypes.files = $$QMLTYPES_FILENAME + do_install_qmltypes.path = $$QMLTYPES_INSTALL_DIR + do_install_qmltypes.CONFIG += no_link + prefix_build: INSTALLS += do_install_qmltypes + else: COPIES += do_install_qmltypes } QMAKE_EXTRA_COMPILERS += qmltyperegistrar_compiler qmltyperegistrar_qmltypes |