diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 22:27:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 12:04:49 +0200 |
| commit | fbfb4d4b9a415808366760668a2645f550a72c8f (patch) | |
| tree | 9bdadd86f67dc7c47464f256f2b92400305d81c7 /mkspecs/features | |
| parent | f8ff2ae69e6647c4738cbd77a46701bd8c0e2a63 (diff) | |
preserve the directory structure of QML_FILES
Change-Id: I39ccdbf59887f14be7dad492598160eebb94ce78
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 7 |
1 files changed, 6 insertions, 1 deletions
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 |