summaryrefslogtreecommitdiff
path: root/examples/webchannel/qwclient
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-19 21:45:05 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-19 21:45:05 +0200
commit4fda82b66e17cc03e6b08f1afd135069cfef09b7 (patch)
tree303b85aaa1b04b3de819c0b77c509a7afa8540a7 /examples/webchannel/qwclient
parentb025372d8b59b0080e1aa1d43b28da2c5544d30c (diff)
parent39692e398ef847a1d6482419a617452cb1e5ae0d (diff)
downloadqtwebchannel-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/qwclient')
-rw-r--r--examples/webchannel/qwclient/qwclient.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webchannel/qwclient/qwclient.pro b/examples/webchannel/qwclient/qwclient.pro
index 587571a..374a63b 100644
--- a/examples/webchannel/qwclient/qwclient.pro
+++ b/examples/webchannel/qwclient/qwclient.pro
@@ -5,5 +5,5 @@ exampleassets.files += \
package.json \
README
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/qwclient
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/qwclient
include(../exampleassets.pri)