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/chatclient-html | |
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/chatclient-html')
-rw-r--r-- | examples/webchannel/chatclient-html/chatclient-html.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webchannel/chatclient-html/chatclient-html.pro b/examples/webchannel/chatclient-html/chatclient-html.pro index f5f0bf4..6aa0b0a 100644 --- a/examples/webchannel/chatclient-html/chatclient-html.pro +++ b/examples/webchannel/chatclient-html/chatclient-html.pro @@ -3,5 +3,5 @@ TEMPLATE = aux exampleassets.files += \ chatclient.html -exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/chatclient-html +exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/chatclient-html include(../exampleassets.pri) |