summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-22 15:31:27 +0200
committerLiang Qi <liang.qi@qt.io>2016-04-27 21:08:47 +0000
commitf1958dbbead8843a96b1b59de59d8db340e0196b (patch)
treeeceaa6199261bb6a3f53d4b20a7175a0d3c26517 /mkspecs
parenta060d25ef2d71567d4057016d22f318ffda9dcf7 (diff)
make use of COPIES
Change-Id: I34965cada901fce3cf300a99fa65d4d3f9bd4578 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qml_module.prf19
1 files changed, 2 insertions, 17 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index e71543e244..9e136a49f2 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -25,25 +25,10 @@ qml1_target: \
else: \
instbase = $$[QT_INSTALL_QML]
-!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) {
- # 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 = $$instbase/$$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}
- qmlfiles2build.CONFIG = no_link no_clean
-
- QMAKE_EXTRA_COMPILERS += qmlfiles2build
-}
-
# Install rules
qmldir.base = $$_PRO_FILE_PWD_
qmldir.files = $$fq_qml_files
qmldir.path = $$instbase/$$TARGETPATH
INSTALLS += qmldir
+
+!prefix_build: COPIES += qmldir