diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:27 +0200 |
| commit | 034d052823c5d1f36dd1378716c7757c1c0c78d0 (patch) | |
| tree | 84b0edef2cd1e2fffe650c27f4bef9fe2ff29953 /examples/webchannel/exampleassets.pri | |
| parent | 9ea8ff6330b0e9259faf332de4af8bd0bfc3fcbf (diff) | |
| parent | 4fda82b66e17cc03e6b08f1afd135069cfef09b7 (diff) | |
| download | qtwebchannel-034d052823c5d1f36dd1378716c7757c1c0c78d0.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ica9ff8d7142c5bd5328d44505beb8c22b4c21766
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 |