summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-22 20:40:33 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-05-10 11:11:34 +0000
commit38baf18df4c572ef36dc203ea9172f3e7b44e06d (patch)
tree564393a2a6b6d14ce3e4e17e2b28c6d648b6d9e6
parent1aef7fe39e0fbbc50e9b93b160602e185734e9f5 (diff)
make use of COPIES
Change-Id: I7106026af6096871368a9e05df94c907e39cdde1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--pkg.pri21
1 files changed, 6 insertions, 15 deletions
diff --git a/pkg.pri b/pkg.pri
index 131167934..7d8c68d22 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -36,14 +36,9 @@ DESTDIR = $$shadowed($$PWD)/bin
INSTALLS += copyqmlinfra_install
# put all our demos/examples and supporting files into $BUILD_DIR/bin
- target_dir = $$DESTDIR/$$resource_dir/qml
- # create extra qmake compiler to copy files across during build step
- copyqmlinfra.input = QML_INFRA_FILES
- copyqmlinfra.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
- copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
- copyqmlinfra.CONFIG += no_link no_clean
- copyqmlinfra.variable_out = POST_TARGETDEPS
- QMAKE_EXTRA_COMPILERS += copyqmlinfra
+ copyqmlinfra.files = $$QML_INFRA_FILES
+ copyqmlinfra.path = $$DESTDIR/$$resource_dir/qml
+ COPIES += copyqmlinfra
}
!isEmpty(QML_MESHES_FILES) {
@@ -53,11 +48,7 @@ DESTDIR = $$shadowed($$PWD)/bin
copyqmlmeshes_install.path = $$target.path/$$resource_dir/qml/meshes
INSTALLS += copyqmlmeshes_install
- target_dir = $$DESTDIR/$$resource_dir/qml/meshes
- copyqmlmeshes.input = QML_MESHES_FILES
- copyqmlmeshes.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
- copyqmlmeshes.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
- copyqmlmeshes.CONFIG += no_link no_clean
- copyqmlmeshes.variable_out = POST_TARGETDEPS
- QMAKE_EXTRA_COMPILERS += copyqmlmeshes
+ copyqmlmeshes.files = $$QML_MESHES_FILES
+ copyqmlmeshes.path = $$DESTDIR/$$resource_dir/qml/meshes
+ COPIES += copyqmlmeshes
}