diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:05 +0200 |
| commit | 4fda82b66e17cc03e6b08f1afd135069cfef09b7 (patch) | |
| tree | 303b85aaa1b04b3de819c0b77c509a7afa8540a7 /examples/webchannel/exampleassets.pri | |
| parent | b025372d8b59b0080e1aa1d43b28da2c5544d30c (diff) | |
| parent | 39692e398ef847a1d6482419a617452cb1e5ae0d (diff) | |
| download | qtwebchannel-4fda82b66e17cc03e6b08f1afd135069cfef09b7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
Diffstat (limited to 'examples/webchannel/exampleassets.pri')
| -rw-r--r-- | examples/webchannel/exampleassets.pri | 16 |
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 |