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