diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
| commit | ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (patch) | |
| tree | 3379cee43d6acae95312e51e6cd05c3c4198a95e /examples/webchannel/exampleassets.pri | |
| parent | 749951c19cbb7d301bed20f24d16dd4e713485c2 (diff) | |
| parent | d84318e98aa3cbac11b4f95b3581e95aab96a34a (diff) | |
| download | qtwebchannel-ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1
Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c
Diffstat (limited to 'examples/webchannel/exampleassets.pri')
| -rw-r--r-- | examples/webchannel/exampleassets.pri | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/examples/webchannel/exampleassets.pri b/examples/webchannel/exampleassets.pri index bbdf656..094d4d8 100644 --- a/examples/webchannel/exampleassets.pri +++ b/examples/webchannel/exampleassets.pri @@ -1,12 +1,5 @@ # This adds the qwebchannel js library to an example, creating a self-contained bundle -QTDIR_build { - # Build from within Qt. Copy and install the reference lib. - jslib = $$dirname(_QMAKE_CONF_)/src/webchannel/qwebchannel.js - assetcopy.files = $$jslib -} else { - # This is what an actual 3rd party project would do. - jslib = qwebchannel.js -} +jslib = $$PWD/shared/qwebchannel.js # This installs all assets including qwebchannel.js, regardless of the source. exampleassets.files += $$jslib @@ -16,7 +9,10 @@ INSTALLS += exampleassets !equals(_PRO_FILE_PWD_, $$OUT_PWD) { # Shadow build, copy all example assets. - assetcopy.files = $$exampleassets.files + assetcopy.files += $$exampleassets.files +} else { + # Just copy jslib - other assets are already in place. + assetcopy.files = $$jslib } assetcopy.path = $$OUT_PWD |