From fbfb4d4b9a415808366760668a2645f550a72c8f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Aug 2012 22:27:26 +0200 Subject: preserve the directory structure of QML_FILES Change-Id: I39ccdbf59887f14be7dad492598160eebb94ce78 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qml_module.prf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index cf62a86ce6..10ee3bf3a7 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -12,8 +12,12 @@ OTHER_FILES += $$fq_qml_files exists($$[QT_HOST_PREFIX]/.qmake.cache) { # These bizarre rules copy the files to the qtbase build directory + defineReplace(qmlModStripSrcDir) { + return($$relative_path($$1, $$_PRO_FILE_PWD_)) + } + qmlfiles2build.input = fq_qml_files - qmlfiles2build.output = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + qmlfiles2build.output = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir} !contains(TEMPLATE, vc.*): qmlfiles2build.variable_out = PRE_TARGETDEPS qmlfiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} qmlfiles2build.name = COPY ${QMAKE_FILE_IN} @@ -23,6 +27,7 @@ exists($$[QT_HOST_PREFIX]/.qmake.cache) { } # Install rules +qmldir.base = $$_PRO_FILE_PWD_ qmldir.files = $$fq_qml_files qmldir.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += qmldir -- cgit v1.2.3