From bd0f933457227c615c5f11aacd471e58b88678e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Apr 2016 20:59:40 +0200 Subject: make use of COPIES Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9 Reviewed-by: Milian Wolff --- examples/webchannel/exampleassets.pri | 16 ++++------------ 1 file 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 -- cgit v1.2.1