diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-08 11:41:51 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-08 14:51:48 +0100 |
| commit | 8b709c0779ffd6d6d9fa9322e7cff46f51076848 (patch) | |
| tree | 8f85b22630e3ac46de23c666da0f06a015b8e0f5 /src | |
| parent | c44106529719094385a27d171094a1440e3b4004 (diff) | |
qmltypes.prf: Assume bare filename for QMLTYPES_FILENAME
Otherwise the user has to specify for example $$OUT_PWD/plugins.qmltypes
in order to generate a file with a specific name.
Change-Id: I72b3c0840e35e7fde454a32663f601de1c7333ce
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index be44f73cec..4fed3c69c7 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -30,8 +30,8 @@ isEmpty(QML_IMPORT_MINOR_VERSION) { } isEmpty(QMLTYPES_FILENAME) { - plugin: QMLTYPES_FILENAME = $$OUT_PWD/plugins.qmltypes - else: QMLTYPES_FILENAME = $$OUT_PWD/$${TEMPLATE}.qmltypes + plugin: QMLTYPES_FILENAME = plugins.qmltypes + else: QMLTYPES_FILENAME = $${TEMPLATE}.qmltypes } qt_module_deps = $$replace(QT, -private$, '') @@ -76,7 +76,7 @@ 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_qmltypes.files = $$QMLTYPES_FILENAME + do_install_qmltypes.files = $$OUT_PWD/$$QMLTYPES_FILENAME do_install_qmltypes.path = $$QMLTYPES_INSTALL_DIR do_install_qmltypes.CONFIG += no_link prefix_build: INSTALLS += do_install_qmltypes |