summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-22 20:59:40 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-28 18:59:08 +0000
commitbd0f933457227c615c5f11aacd471e58b88678e8 (patch)
tree35544998c08f126b7a6623b8700f012d4a62e729
parent79a0e79b248c1cac4f8a69efc228e28e4ac4725d (diff)
downloadqtwebchannel-bd0f933457227c615c5f11aacd471e58b88678e8.tar.gz
make use of COPIES
Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
-rw-r--r--examples/webchannel/exampleassets.pri16
1 files changed, 4 insertions, 12 deletions
diff --git a/examples/webchannel/exampleassets.pri b/examples/webchannel/exampleassets.pri
index 035ca12..bbdf656 100644
--- a/examples/webchannel/exampleassets.pri
+++ b/examples/webchannel/exampleassets.pri
@@ -2,7 +2,7 @@
QTDIR_build {
# Build from within Qt. Copy and install the reference lib.
jslib = $$dirname(_QMAKE_CONF_)/src/webchannel/qwebchannel.js
- copyfiles = $$jslib
+ assetcopy.files = $$jslib
} else {
# This is what an actual 3rd party project would do.
jslib = qwebchannel.js
@@ -16,16 +16,8 @@ INSTALLS += exampleassets
!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
# Shadow build, copy all example assets.
- copyfiles = $$exampleassets.files
+ assetcopy.files = $$exampleassets.files
}
-defineReplace(stripSrcDir) {
- return($$basename(1))
-}
-
-assetcopy.input = copyfiles
-assetcopy.output = $$OUT_PWD/${QMAKE_FUNC_FILE_IN_stripSrcDir}
-assetcopy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-assetcopy.name = COPY ${QMAKE_FILE_IN}
-assetcopy.CONFIG = no_link target_predeps
-QMAKE_EXTRA_COMPILERS += assetcopy
+assetcopy.path = $$OUT_PWD
+COPIES += assetcopy